summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /dev-libs
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/DFB++/metadata.xml5
-rw-r--r--dev-libs/DirectFB/metadata.xml5
-rw-r--r--dev-libs/Ice/metadata.xml1
-rw-r--r--dev-libs/MicroJSON/metadata.xml5
-rw-r--r--dev-libs/STLport/metadata.xml5
-rw-r--r--dev-libs/UTF8Strings/metadata.xml5
-rw-r--r--dev-libs/ace/metadata.xml5
-rw-r--r--dev-libs/appstream-glib/metadata.xml5
-rw-r--r--dev-libs/asyncresolv/metadata.xml5
-rw-r--r--dev-libs/atk/metadata.xml5
-rw-r--r--dev-libs/bitset/metadata.xml5
-rw-r--r--dev-libs/blitz/metadata.xml5
-rw-r--r--dev-libs/boost/metadata.xml5
-rw-r--r--dev-libs/botan/metadata.xml10
-rw-r--r--dev-libs/btparse/metadata.xml5
-rw-r--r--dev-libs/btparser/metadata.xml5
-rw-r--r--dev-libs/c-blosc/metadata.xml5
-rw-r--r--dev-libs/cgicc/metadata.xml5
-rw-r--r--dev-libs/cgilib/metadata.xml5
-rw-r--r--dev-libs/clearsilver/metadata.xml5
-rw-r--r--dev-libs/cloog/metadata.xml1
-rw-r--r--dev-libs/console_bridge/metadata.xml5
-rw-r--r--dev-libs/crossguid/metadata.xml4
-rw-r--r--dev-libs/cryptlib/metadata.xml5
-rw-r--r--dev-libs/crypto++/metadata.xml5
-rw-r--r--dev-libs/cvector/metadata.xml1
-rw-r--r--dev-libs/cxxtools/metadata.xml1
-rw-r--r--dev-libs/cygwin/metadata.xml5
-rw-r--r--dev-libs/cyrus-imap-dev/metadata.xml5
-rw-r--r--dev-libs/cyrus-sasl/metadata.xml5
-rw-r--r--dev-libs/d0_blind_id/metadata.xml5
-rw-r--r--dev-libs/darts/metadata.xml10
-rw-r--r--dev-libs/dbus-glib/metadata.xml1
-rw-r--r--dev-libs/dee/metadata.xml5
-rw-r--r--dev-libs/ding-libs/metadata.xml5
-rw-r--r--dev-libs/dotconf/metadata.xml5
-rw-r--r--dev-libs/double-conversion/metadata.xml5
-rw-r--r--dev-libs/e_dbus/metadata.xml5
-rw-r--r--dev-libs/ecore/metadata.xml5
-rw-r--r--dev-libs/eet/metadata.xml5
-rw-r--r--dev-libs/eeze/metadata.xml5
-rw-r--r--dev-libs/efl/metadata.xml5
-rw-r--r--dev-libs/efreet/metadata.xml5
-rw-r--r--dev-libs/eina/metadata.xml5
-rw-r--r--dev-libs/eio/metadata.xml5
-rw-r--r--dev-libs/elfutils/metadata.xml5
-rw-r--r--dev-libs/embryo/metadata.xml5
-rw-r--r--dev-libs/engine_pkcs11/metadata.xml5
-rw-r--r--dev-libs/expat/metadata.xml5
-rw-r--r--dev-libs/fampp2/metadata.xml5
-rw-r--r--dev-libs/ferrisloki/metadata.xml5
-rw-r--r--dev-libs/folks/metadata.xml5
-rw-r--r--dev-libs/freexl/metadata.xml5
-rw-r--r--dev-libs/g-wrap/metadata.xml5
-rw-r--r--dev-libs/gdl/metadata.xml5
-rw-r--r--dev-libs/geoip/metadata.xml5
-rw-r--r--dev-libs/gf-complete/metadata.xml5
-rw-r--r--dev-libs/gf2x/metadata.xml5
-rw-r--r--dev-libs/gjs/metadata.xml5
-rw-r--r--dev-libs/glib/metadata.xml5
-rw-r--r--dev-libs/gmime/metadata.xml5
-rw-r--r--dev-libs/gmp/metadata.xml5
-rw-r--r--dev-libs/gnulib/metadata.xml5
-rw-r--r--dev-libs/gobject-introspection-common/metadata.xml5
-rw-r--r--dev-libs/gobject-introspection/metadata.xml5
-rw-r--r--dev-libs/gom/metadata.xml5
-rw-r--r--dev-libs/grantlee/metadata.xml5
-rw-r--r--dev-libs/gtx/metadata.xml5
-rw-r--r--dev-libs/hidapi/metadata.xml5
-rw-r--r--dev-libs/hyphen/metadata.xml5
-rw-r--r--dev-libs/icu/metadata.xml5
-rw-r--r--dev-libs/iksemel/metadata.xml1
-rw-r--r--dev-libs/iniparser/metadata.xml1
-rw-r--r--dev-libs/intel-common/metadata.xml5
-rw-r--r--dev-libs/isl/metadata.xml1
-rw-r--r--dev-libs/jansson/metadata.xml5
-rw-r--r--dev-libs/jemalloc/metadata.xml5
-rw-r--r--dev-libs/jerasure/metadata.xml5
-rw-r--r--dev-libs/json-glib/metadata.xml5
-rw-r--r--dev-libs/judy/metadata.xml5
-rw-r--r--dev-libs/klibc/metadata.xml1
-rw-r--r--dev-libs/kpathsea/metadata.xml5
-rw-r--r--dev-libs/kqoauth/metadata.xml5
-rw-r--r--dev-libs/leveldb/metadata.xml5
-rw-r--r--dev-libs/libIDL/metadata.xml5
-rw-r--r--dev-libs/libaio/metadata.xml5
-rw-r--r--dev-libs/libappindicator/metadata.xml1
-rw-r--r--dev-libs/libassuan/metadata.xml5
-rw-r--r--dev-libs/libatasmart/metadata.xml1
-rw-r--r--dev-libs/libatomic_ops/metadata.xml5
-rw-r--r--dev-libs/libattica/metadata.xml5
-rw-r--r--dev-libs/libbegemot/metadata.xml5
-rw-r--r--dev-libs/libbrahe/metadata.xml5
-rw-r--r--dev-libs/libbsd/metadata.xml5
-rw-r--r--dev-libs/libbson/metadata.xml5
-rw-r--r--dev-libs/libbulletml/metadata.xml5
-rw-r--r--dev-libs/libburn/metadata.xml1
-rw-r--r--dev-libs/libcdio-paranoia/metadata.xml5
-rw-r--r--dev-libs/libcdio/metadata.xml5
-rw-r--r--dev-libs/libchewing/metadata.xml5
-rw-r--r--dev-libs/libclc/metadata.xml5
-rw-r--r--dev-libs/libconfig/metadata.xml5
-rw-r--r--dev-libs/libcoyotl/metadata.xml5
-rw-r--r--dev-libs/libcroco/metadata.xml5
-rw-r--r--dev-libs/libdbusmenu-qt/metadata.xml6
-rw-r--r--dev-libs/libdbusmenu/metadata.xml6
-rw-r--r--dev-libs/libdivecomputer/metadata.xml5
-rw-r--r--dev-libs/libdnet/metadata.xml5
-rw-r--r--dev-libs/libdnsres/metadata.xml5
-rw-r--r--dev-libs/libdshconfig/metadata.xml5
-rw-r--r--dev-libs/libdynd/metadata.xml5
-rw-r--r--dev-libs/libebml/metadata.xml1
-rw-r--r--dev-libs/libedit/metadata.xml5
-rw-r--r--dev-libs/libee/metadata.xml5
-rw-r--r--dev-libs/liberasurecode/metadata.xml5
-rw-r--r--dev-libs/libestr/metadata.xml5
-rw-r--r--dev-libs/libevdev/metadata.xml5
-rw-r--r--dev-libs/libevocosm/metadata.xml5
-rw-r--r--dev-libs/libexecinfo/metadata.xml5
-rw-r--r--dev-libs/libexplain/metadata.xml5
-rw-r--r--dev-libs/libf2c/metadata.xml5
-rw-r--r--dev-libs/libffi/metadata.xml5
-rw-r--r--dev-libs/libgamin/metadata.xml1
-rw-r--r--dev-libs/libgaminggear/metadata.xml5
-rw-r--r--dev-libs/libgcrypt/metadata.xml5
-rw-r--r--dev-libs/libgdata/metadata.xml5
-rw-r--r--dev-libs/libgee/metadata.xml5
-rw-r--r--dev-libs/libgit2-glib/metadata.xml5
-rw-r--r--dev-libs/libgpg-error/metadata.xml5
-rw-r--r--dev-libs/libgringotts/metadata.xml5
-rw-r--r--dev-libs/libgudev/metadata.xml7
-rw-r--r--dev-libs/libgusb/metadata.xml5
-rw-r--r--dev-libs/libgweather/metadata.xml5
-rw-r--r--dev-libs/libiconv/metadata.xml5
-rw-r--r--dev-libs/libindicate-qt/metadata.xml6
-rw-r--r--dev-libs/libindicate/metadata.xml6
-rw-r--r--dev-libs/libindicator/metadata.xml1
-rw-r--r--dev-libs/libinput/metadata.xml10
-rw-r--r--dev-libs/libintl/metadata.xml5
-rw-r--r--dev-libs/libisoburn/metadata.xml1
-rw-r--r--dev-libs/libisofs/metadata.xml1
-rw-r--r--dev-libs/libixion/metadata.xml5
-rw-r--r--dev-libs/libjit/metadata.xml5
-rw-r--r--dev-libs/libksba/metadata.xml5
-rw-r--r--dev-libs/liblist/metadata.xml1
-rw-r--r--dev-libs/liblogging/metadata.xml5
-rw-r--r--dev-libs/liblognorm/metadata.xml5
-rw-r--r--dev-libs/liblouis/metadata.xml5
-rw-r--r--dev-libs/libltdl/metadata.xml5
-rw-r--r--dev-libs/libmal/metadata.xml1
-rw-r--r--dev-libs/libmateweather/metadata.xml5
-rw-r--r--dev-libs/libmaxminddb/metadata.xml5
-rw-r--r--dev-libs/libmcrypt/metadata.xml5
-rw-r--r--dev-libs/libmimedir/metadata.xml1
-rw-r--r--dev-libs/libmoe/metadata.xml5
-rw-r--r--dev-libs/libnatspec/metadata.xml5
-rw-r--r--dev-libs/libnl/metadata.xml5
-rw-r--r--dev-libs/liboil/metadata.xml1
-rw-r--r--dev-libs/liboobs/metadata.xml5
-rw-r--r--dev-libs/liborcus/metadata.xml5
-rw-r--r--dev-libs/libotf/metadata.xml10
-rw-r--r--dev-libs/libp11/metadata.xml5
-rw-r--r--dev-libs/libpcre/metadata.xml5
-rw-r--r--dev-libs/libpeas/metadata.xml5
-rw-r--r--dev-libs/libpipeline/metadata.xml5
-rw-r--r--dev-libs/libpqxx/metadata.xml5
-rw-r--r--dev-libs/libpthread-stubs/metadata.xml5
-rw-r--r--dev-libs/libpwquality/metadata.xml5
-rw-r--r--dev-libs/libqtxdg/metadata.xml10
-rw-r--r--dev-libs/libqzeitgeist/metadata.xml5
-rw-r--r--dev-libs/libreport/metadata.xml5
-rw-r--r--dev-libs/librevenge/metadata.xml5
-rw-r--r--dev-libs/libroadnav/metadata.xml5
-rw-r--r--dev-libs/librra/metadata.xml1
-rw-r--r--dev-libs/librtfcomp/metadata.xml1
-rw-r--r--dev-libs/libsecp256k1/metadata.xml5
-rw-r--r--dev-libs/libserialport/metadata.xml5
-rw-r--r--dev-libs/libsigc++/metadata.xml5
-rw-r--r--dev-libs/libsigsegv/metadata.xml5
-rw-r--r--dev-libs/libspnav/metadata.xml5
-rw-r--r--dev-libs/libspt/metadata.xml5
-rw-r--r--dev-libs/libtar/metadata.xml5
-rw-r--r--dev-libs/libtasn1/metadata.xml5
-rw-r--r--dev-libs/libtecla/metadata.xml5
-rw-r--r--dev-libs/libtermkey/metadata.xml5
-rw-r--r--dev-libs/libunique/metadata.xml5
-rw-r--r--dev-libs/libunistring/metadata.xml5
-rw-r--r--dev-libs/libusb-compat/metadata.xml10
-rw-r--r--dev-libs/libusb/metadata.xml10
-rw-r--r--dev-libs/libusbhp/metadata.xml5
-rw-r--r--dev-libs/libvolume_id/metadata.xml5
-rw-r--r--dev-libs/libvterm-neovim/metadata.xml5
-rw-r--r--dev-libs/libvterm/metadata.xml5
-rw-r--r--dev-libs/libwacom/metadata.xml1
-rw-r--r--dev-libs/libxml2/metadata.xml5
-rw-r--r--dev-libs/libxslt/metadata.xml5
-rw-r--r--dev-libs/libzeitgeist/metadata.xml5
-rw-r--r--dev-libs/libzip/metadata.xml5
-rw-r--r--dev-libs/link-grammar/metadata.xml5
-rw-r--r--dev-libs/log4cpp/metadata.xml5
-rw-r--r--dev-libs/log4cxx/metadata.xml5
-rw-r--r--dev-libs/m17n-lib/metadata.xml5
-rw-r--r--dev-libs/maloc/metadata.xml5
-rw-r--r--dev-libs/marisa/metadata.xml5
-rw-r--r--dev-libs/matrixssl/metadata.xml5
-rw-r--r--dev-libs/mini-xml/metadata.xml5
-rw-r--r--dev-libs/mongo-c-driver/metadata.xml5
-rw-r--r--dev-libs/mongo-cxx-driver/metadata.xml5
-rw-r--r--dev-libs/mpc/metadata.xml5
-rw-r--r--dev-libs/mpfr/metadata.xml5
-rw-r--r--dev-libs/nettle/metadata.xml5
-rw-r--r--dev-libs/npth/metadata.xml5
-rw-r--r--dev-libs/nspr/metadata.xml5
-rw-r--r--dev-libs/nss/metadata.xml5
-rw-r--r--dev-libs/ntl/metadata.xml10
-rw-r--r--dev-libs/oniguruma/metadata.xml5
-rw-r--r--dev-libs/opencryptoki/metadata.xml5
-rw-r--r--dev-libs/openct/metadata.xml5
-rw-r--r--dev-libs/opensc/metadata.xml5
-rw-r--r--dev-libs/openspecfun/metadata.xml5
-rw-r--r--dev-libs/openssl/metadata.xml5
-rw-r--r--dev-libs/pakchois/metadata.xml5
-rw-r--r--dev-libs/pcl/metadata.xml5
-rw-r--r--dev-libs/pcre++/metadata.xml5
-rw-r--r--dev-libs/pkcs11-helper/metadata.xml5
-rw-r--r--dev-libs/poco/metadata.xml5
-rw-r--r--dev-libs/popt/metadata.xml5
-rw-r--r--dev-libs/ppl/metadata.xml5
-rw-r--r--dev-libs/pslib/metadata.xml10
-rw-r--r--dev-libs/ptexenc/metadata.xml5
-rw-r--r--dev-libs/pth/metadata.xml5
-rw-r--r--dev-libs/ptypes/metadata.xml5
-rw-r--r--dev-libs/pugixml/metadata.xml5
-rw-r--r--dev-libs/purpose/metadata.xml5
-rw-r--r--dev-libs/qcustomplot/metadata.xml5
-rw-r--r--dev-libs/qjson/metadata.xml5
-rw-r--r--dev-libs/qoauth/metadata.xml5
-rw-r--r--dev-libs/qof/metadata.xml5
-rw-r--r--dev-libs/qqwing/metadata.xml5
-rw-r--r--dev-libs/qrosscore/metadata.xml5
-rw-r--r--dev-libs/qrosspython/metadata.xml5
-rw-r--r--dev-libs/quantlib/metadata.xml5
-rw-r--r--dev-libs/quazip/metadata.xml1
-rw-r--r--dev-libs/rapidxml/metadata.xml5
-rw-r--r--dev-libs/rasqal/metadata.xml5
-rw-r--r--dev-libs/re2/metadata.xml5
-rw-r--r--dev-libs/redland-bindings/metadata.xml5
-rw-r--r--dev-libs/redland/metadata.xml5
-rw-r--r--dev-libs/rlog/metadata.xml5
-rw-r--r--dev-libs/sblim-sfcc/metadata.xml5
-rw-r--r--dev-libs/serd/metadata.xml5
-rw-r--r--dev-libs/sni-qt/metadata.xml5
-rw-r--r--dev-libs/socketstream/metadata.xml5
-rw-r--r--dev-libs/sord/metadata.xml5
-rw-r--r--dev-libs/stlsoft/metadata.xml5
-rw-r--r--dev-libs/tinyxml2/metadata.xml5
-rw-r--r--dev-libs/tntnet/metadata.xml1
-rw-r--r--dev-libs/totem-pl-parser/metadata.xml5
-rw-r--r--dev-libs/tre/metadata.xml5
-rw-r--r--dev-libs/tvmet/metadata.xml5
-rw-r--r--dev-libs/uchardet/metadata.xml5
-rw-r--r--dev-libs/ucommon/metadata.xml5
-rw-r--r--dev-libs/unibilium/metadata.xml5
-rw-r--r--dev-libs/urdfdom_headers/metadata.xml5
-rw-r--r--dev-libs/userspace-rcu/metadata.xml5
-rw-r--r--dev-libs/ustr/metadata.xml5
-rw-r--r--dev-libs/uthash/metadata.xml5
-rw-r--r--dev-libs/vala-common/metadata.xml5
-rw-r--r--dev-libs/vdk/metadata.xml1
-rw-r--r--dev-libs/wayland/metadata.xml5
-rw-r--r--dev-libs/weston/metadata.xml5
-rw-r--r--dev-libs/wnn7sdk/metadata.xml5
-rw-r--r--dev-libs/xalan-c/metadata.xml5
-rw-r--r--dev-libs/xapian-bindings/metadata.xml5
-rw-r--r--dev-libs/xapian/metadata.xml5
-rw-r--r--dev-libs/xerces-c/metadata.xml5
-rw-r--r--dev-libs/xml-security-c/metadata.xml5
-rw-r--r--dev-libs/xmlsec/metadata.xml5
-rw-r--r--dev-libs/xmlwrapp/metadata.xml5
-rw-r--r--dev-libs/xplc/metadata.xml5
-rw-r--r--dev-libs/xqilla/metadata.xml5
-rw-r--r--dev-libs/yajl/metadata.xml5
-rw-r--r--dev-libs/zthread/metadata.xml5
283 files changed, 1060 insertions, 297 deletions
diff --git a/dev-libs/DFB++/metadata.xml b/dev-libs/DFB++/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/dev-libs/DFB++/metadata.xml
+++ b/dev-libs/DFB++/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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
index 4145b8688eca..668681eec0d2 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>
+ <email>graphics@gentoo.org</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/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index 8a5655080a27..1d520cb3e1f4 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/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>cpp</herd>
<maintainer>
<email>cpp@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/MicroJSON/metadata.xml b/dev-libs/MicroJSON/metadata.xml
index 65cbd1fbe688..b0a8fc78bf7a 100644
--- a/dev-libs/MicroJSON/metadata.xml
+++ b/dev-libs/MicroJSON/metadata.xml
@@ -6,7 +6,10 @@
<name>Gorelov Grigory</name>
<description>Maintainer and upstream developer.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Small and simple to use JSON generation and parsing library.
</longdescription>
diff --git a/dev-libs/STLport/metadata.xml b/dev-libs/STLport/metadata.xml
index aa3ea990d7c0..4c17a73ca841 100644
--- a/dev-libs/STLport/metadata.xml
+++ b/dev-libs/STLport/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<use>
<flag name="boost">Enable the usage of <pkg>dev-libs/boost</pkg></flag>
</use>
diff --git a/dev-libs/UTF8Strings/metadata.xml b/dev-libs/UTF8Strings/metadata.xml
index eec867603cf2..092cd38416c5 100644
--- a/dev-libs/UTF8Strings/metadata.xml
+++ b/dev-libs/UTF8Strings/metadata.xml
@@ -6,7 +6,10 @@
<name>Gorelov Grigory</name>
<description>Maintainer and upstream developer.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
C++ library that provides ability to work natively with UTF8 strings in a very simple way.
</longdescription>
diff --git a/dev-libs/ace/metadata.xml b/dev-libs/ace/metadata.xml
index 7c11e3649258..357b0e311567 100644
--- a/dev-libs/ace/metadata.xml
+++ b/dev-libs/ace/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
<use>
<flag name="ciao">Include Component Intergraced Ace ORB into the build of
ace</flag>
diff --git a/dev-libs/appstream-glib/metadata.xml b/dev-libs/appstream-glib/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/appstream-glib/metadata.xml
+++ b/dev-libs/appstream-glib/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/asyncresolv/metadata.xml b/dev-libs/asyncresolv/metadata.xml
index 89b71d925d27..fb315e3fca6e 100644
--- a/dev-libs/asyncresolv/metadata.xml
+++ b/dev-libs/asyncresolv/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">asyncresolv</remote-id>
</upstream>
diff --git a/dev-libs/atk/metadata.xml b/dev-libs/atk/metadata.xml
index 6949624e59d4..fe3dc94b2bcd 100644
--- a/dev-libs/atk/metadata.xml
+++ b/dev-libs/atk/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>gnome-accessibility</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml
index f6d8c23e83d0..77784e85a962 100644
--- a/dev-libs/bitset/metadata.xml
+++ b/dev-libs/bitset/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="tcmalloc">Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations</flag>
diff --git a/dev-libs/blitz/metadata.xml b/dev-libs/blitz/metadata.xml
index bbedddcd0e73..29db40304e4e 100644
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/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>cpp</herd>
<maintainer>
<email>bicatali@gentoo.org</email>
<description>feel free to fix/update</description>
</maintainer>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription lang="en">
Blitz++ is a meta-template library for array
manipulation in C++ with a speed comparable to Fortran
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 6a63ade407e7..12bd9da54c9d 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<use>
<flag name="context">
Build and install the Boost.Context library and all other
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index b639324ed94e..7204790723b0 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>crypto</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>lloyd@randombit.net</email>
<name>Jack Lloyd </name>
<description>Ebuild contributor and botan author</description>
</maintainer>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
</use>
diff --git a/dev-libs/btparse/metadata.xml b/dev-libs/btparse/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-libs/btparse/metadata.xml
+++ b/dev-libs/btparse/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/btparser/metadata.xml b/dev-libs/btparser/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/btparser/metadata.xml
+++ b/dev-libs/btparser/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/c-blosc/metadata.xml b/dev-libs/c-blosc/metadata.xml
index 873eced15208..6c1b83415686 100644
--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Blosc is a compression library designed to transmit data to the
processor cache faster than the traditional non-compressed memory fetch.
diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
index d5c4c3cd160e..927b724884b2 100644
--- a/dev-libs/cgicc/metadata.xml
+++ b/dev-libs/cgicc/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription lang="en">
GNU cgicc is an ANSI C++ compliant class library that greatly
simplifies the creation of CGI applications for the World Wide
diff --git a/dev-libs/cgilib/metadata.xml b/dev-libs/cgilib/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/dev-libs/cgilib/metadata.xml
+++ b/dev-libs/cgilib/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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/clearsilver/metadata.xml b/dev-libs/clearsilver/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/dev-libs/clearsilver/metadata.xml
+++ b/dev-libs/clearsilver/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>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/cloog/metadata.xml b/dev-libs/cloog/metadata.xml
index 24428f7f4d1a..bf24a593ff3a 100644
--- a/dev-libs/cloog/metadata.xml
+++ b/dev-libs/cloog/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>toolchain</herd>
<maintainer>
<email>toolchain@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/console_bridge/metadata.xml b/dev-libs/console_bridge/metadata.xml
index 1afb1e1800de..b1d7cac01896 100644
--- a/dev-libs/console_bridge/metadata.xml
+++ b/dev-libs/console_bridge/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>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ros/console_bridge</remote-id>
</upstream>
diff --git a/dev-libs/crossguid/metadata.xml b/dev-libs/crossguid/metadata.xml
index 462401dd2172..7a69a40eb4cf 100644
--- a/dev-libs/crossguid/metadata.xml
+++ b/dev-libs/crossguid/metadata.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>xbox</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
<upstream>
<remote-id type="github">graeme-hill/crossguid</remote-id>
</upstream>
diff --git a/dev-libs/cryptlib/metadata.xml b/dev-libs/cryptlib/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/cryptlib/metadata.xml
+++ b/dev-libs/cryptlib/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>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml
index a7483fddbd80..88623c95c128 100644
--- a/dev-libs/crypto++/metadata.xml
+++ b/dev-libs/crypto++/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">cryptopp</remote-id>
</upstream>
diff --git a/dev-libs/cvector/metadata.xml b/dev-libs/cvector/metadata.xml
index b85f98e6bb05..2b0fbb2642dd 100644
--- a/dev-libs/cvector/metadata.xml
+++ b/dev-libs/cvector/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>sci</herd>
<maintainer>
<email>sci@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/cxxtools/metadata.xml b/dev-libs/cxxtools/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/dev-libs/cxxtools/metadata.xml
+++ b/dev-libs/cxxtools/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/dev-libs/cygwin/metadata.xml b/dev-libs/cygwin/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-libs/cygwin/metadata.xml
+++ b/dev-libs/cygwin/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>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/cyrus-imap-dev/metadata.xml b/dev-libs/cyrus-imap-dev/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/dev-libs/cyrus-imap-dev/metadata.xml
+++ b/dev-libs/cyrus-imap-dev/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>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index a3cf1dee6af6..d249f479e6b5 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
<use>
<flag name="authdaemond">Add Courier-IMAP authdaemond unix socket
support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
diff --git a/dev-libs/d0_blind_id/metadata.xml b/dev-libs/d0_blind_id/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-libs/d0_blind_id/metadata.xml
+++ b/dev-libs/d0_blind_id/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/darts/metadata.xml b/dev-libs/darts/metadata.xml
index 2b9413a4279f..1529d2aba036 100644
--- a/dev-libs/darts/metadata.xml
+++ b/dev-libs/darts/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>cjk</herd>
-<herd>cpp</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/dbus-glib/metadata.xml b/dev-libs/dbus-glib/metadata.xml
index 1e26d76c79f5..9a8c724e0b87 100644
--- a/dev-libs/dbus-glib/metadata.xml
+++ b/dev-libs/dbus-glib/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/dee/metadata.xml b/dev-libs/dee/metadata.xml
index 41e304f441d9..f727093552a4 100644
--- a/dev-libs/dee/metadata.xml
+++ b/dev-libs/dee/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">dee</remote-id>
</upstream>
diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml
index eff24b2d008e..7f6ebadc057b 100644
--- a/dev-libs/ding-libs/metadata.xml
+++ b/dev-libs/ding-libs/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -12,4 +11,8 @@
<name>Maxim Koltsov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/dotconf/metadata.xml b/dev-libs/dotconf/metadata.xml
index f7b66d2f7a9d..604a87838abf 100644
--- a/dev-libs/dotconf/metadata.xml
+++ b/dev-libs/dotconf/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>accessibility</herd>
<maintainer>
<email>williamh@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>accessibility@gentoo.org</email>
+ <name>Gentoo Accessibility Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index 6b4f010d7c4a..70729c48e378 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
This library consists of efficient conversion routines that have
been extracted from the V8 JavaScript engine. The code has been
diff --git a/dev-libs/e_dbus/metadata.xml b/dev-libs/e_dbus/metadata.xml
index d136264acd4e..709648204476 100644
--- a/dev-libs/e_dbus/metadata.xml
+++ b/dev-libs/e_dbus/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="bluetooth">Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API</flag>
<flag name="ofono">Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API</flag>
diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index a6bc2952724d..af4e421f71e1 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="ares">Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
<flag name="gles">Add gles support to the ecore-evas-wayland module</flag>
diff --git a/dev-libs/eet/metadata.xml b/dev-libs/eet/metadata.xml
index 74563a36db2a..59ccd709b6d3 100644
--- a/dev-libs/eet/metadata.xml
+++ b/dev-libs/eet/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<longdescription>
EET is a tiny library designed to write an arbitary set of chunks of data to a file
and optionally compress each chunk (very much like a zip file) and allow fast
diff --git a/dev-libs/eeze/metadata.xml b/dev-libs/eeze/metadata.xml
index ae1804c22300..28dd8c02c904 100644
--- a/dev-libs/eeze/metadata.xml
+++ b/dev-libs/eeze/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="utilities">Install some test utilities for mount/umount support in eeze</flag>
</use>
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 097865ae9c00..aab1f92a2974 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="bmp">Enable WBMP image loader</flag>
<flag name="drm">Enable DRM engine</flag>
diff --git a/dev-libs/efreet/metadata.xml b/dev-libs/efreet/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-libs/efreet/metadata.xml
+++ b/dev-libs/efreet/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/eina/metadata.xml b/dev-libs/eina/metadata.xml
index 3e92977173ed..d2820add752e 100644
--- a/dev-libs/eina/metadata.xml
+++ b/dev-libs/eina/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="mempool-buddy">Compile 'buddy' memory pool allocation</flag>
<flag name="mempool-chained-pool">Compile 'chained-pool' memory pool allocation</flag>
diff --git a/dev-libs/eio/metadata.xml b/dev-libs/eio/metadata.xml
index 99165add909f..a9f360ec73af 100644
--- a/dev-libs/eio/metadata.xml
+++ b/dev-libs/eio/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 6d5bc382fd7a..97eb49d358a6 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/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>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<use>
<flag name="lzma">Support automatic decompression of LZMA-compressed files and kernel images</flag>
<flag name="threads">Build the libraries with thread safe support</flag>
diff --git a/dev-libs/embryo/metadata.xml b/dev-libs/embryo/metadata.xml
index d75dabcf86ba..2b46677ccb82 100644
--- a/dev-libs/embryo/metadata.xml
+++ b/dev-libs/embryo/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<longdescription>
Embryo is primarily a shared library that gives you an API to load and control
interpredted programs compiled into the abstract machine bytecode that it
diff --git a/dev-libs/engine_pkcs11/metadata.xml b/dev-libs/engine_pkcs11/metadata.xml
index 9682e47bb258..4ea7fb342876 100644
--- a/dev-libs/engine_pkcs11/metadata.xml
+++ b/dev-libs/engine_pkcs11/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<longdescription>
engine_pkcs11 is an implementation of an engine for OpenSSL.
</longdescription>
diff --git a/dev-libs/expat/metadata.xml b/dev-libs/expat/metadata.xml
index 38f9001688cf..ca2a52825a40 100644
--- a/dev-libs/expat/metadata.xml
+++ b/dev-libs/expat/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>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:libexpat:expat</remote-id>
<remote-id type="sourceforge">expat</remote-id>
diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 748ee49402a9..8baa35426e58 100644
--- a/dev-libs/fampp2/metadata.xml
+++ b/dev-libs/fampp2/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<use>
<flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
</use>
diff --git a/dev-libs/ferrisloki/metadata.xml b/dev-libs/ferrisloki/metadata.xml
index d19658856e1e..8a7e0369cc6c 100644
--- a/dev-libs/ferrisloki/metadata.xml
+++ b/dev-libs/ferrisloki/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
<use>
<flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
</use>
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index 682c32415814..2b09015a8ed9 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
<flag name="telepathy">Load contacts from the Telepathy framework</flag>
diff --git a/dev-libs/freexl/metadata.xml b/dev-libs/freexl/metadata.xml
index 3190fbf9c377..203359d7bee8 100644
--- a/dev-libs/freexl/metadata.xml
+++ b/dev-libs/freexl/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>sci-geosciences</herd>
+ <maintainer>
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/g-wrap/metadata.xml b/dev-libs/g-wrap/metadata.xml
index c8d5dd1b2a4e..a9e72bc1fe76 100644
--- a/dev-libs/g-wrap/metadata.xml
+++ b/dev-libs/g-wrap/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>scheme</herd>
<maintainer>
<email>hkBst@gentoo.org</email>
<name>Marijn Schouten</name>
</maintainer>
+ <maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+ </maintainer>
<longdescription lang="en">
G-Wrap is a tool (and Guile library) for generating function wrappers for inter-language calls. It currently only supports generating Guile wrappers for C functions.
</longdescription>
diff --git a/dev-libs/gdl/metadata.xml b/dev-libs/gdl/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gdl/metadata.xml
+++ b/dev-libs/gdl/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
index 3b26dceb6f19..fe65a007727d 100644
--- a/dev-libs/geoip/metadata.xml
+++ b/dev-libs/geoip/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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">maxmind/geoip-api-c</remote-id>
</upstream>
diff --git a/dev-libs/gf-complete/metadata.xml b/dev-libs/gf-complete/metadata.xml
index 4d820980847a..ca21ac028d72 100644
--- a/dev-libs/gf-complete/metadata.xml
+++ b/dev-libs/gf-complete/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>openstack</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+<maintainer>
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/gf2x/metadata.xml b/dev-libs/gf2x/metadata.xml
index 65b8fbc6e876..593d2604a24a 100644
--- a/dev-libs/gf2x/metadata.xml
+++ b/dev-libs/gf2x/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-mathematics</herd>
+ <maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+ </maintainer>
<longdescription lang="en">
gf2x is a C/C++ software package containing routines for fast
arithmetic in GF(2)[x] (multiplication, squaring, GCD) and searching
diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/gjs/metadata.xml
+++ b/dev-libs/gjs/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 9dda65d6b97c..0a04ffb82764 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="dbus">Enable dependencies required by glib libraries
using dbus service to manage settings saving</flag>
diff --git a/dev-libs/gmime/metadata.xml b/dev-libs/gmime/metadata.xml
index 009ffdab28f8..79928fb0332f 100644
--- a/dev-libs/gmime/metadata.xml
+++ b/dev-libs/gmime/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">spruce</remote-id>
</upstream>
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index c59de3bde89c..e99d09a18dce 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/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>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
<use>
<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
<flag name="pgo">After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
diff --git a/dev-libs/gnulib/metadata.xml b/dev-libs/gnulib/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/dev-libs/gnulib/metadata.xml
+++ b/dev-libs/gnulib/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>prefix</herd>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/gobject-introspection-common/metadata.xml b/dev-libs/gobject-introspection-common/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gobject-introspection-common/metadata.xml
+++ b/dev-libs/gobject-introspection-common/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/gobject-introspection/metadata.xml b/dev-libs/gobject-introspection/metadata.xml
index d1585c3f58c6..8470084cffc6 100644
--- a/dev-libs/gobject-introspection/metadata.xml
+++ b/dev-libs/gobject-introspection/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="doctool">Install g-ir-doc-tool for generating documentation
from introspected data</flag>
diff --git a/dev-libs/gom/metadata.xml b/dev-libs/gom/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/gom/metadata.xml
+++ b/dev-libs/gom/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/grantlee/metadata.xml b/dev-libs/grantlee/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/grantlee/metadata.xml
+++ b/dev-libs/grantlee/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/gtx/metadata.xml b/dev-libs/gtx/metadata.xml
index b0d00b8ec527..9411a2c8afcf 100644
--- a/dev-libs/gtx/metadata.xml
+++ b/dev-libs/gtx/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>
GTX is a small collection of convenience functions intended to enhance the GLib
testing framework. With specific emphasis on easing the pain of writing test
diff --git a/dev-libs/hidapi/metadata.xml b/dev-libs/hidapi/metadata.xml
index af7f94530f13..3e897ac50573 100644
--- a/dev-libs/hidapi/metadata.xml
+++ b/dev-libs/hidapi/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="fox">Build a x11-libs/fox GUI</flag>
</use>
diff --git a/dev-libs/hyphen/metadata.xml b/dev-libs/hyphen/metadata.xml
index 7cc81f65d94e..436358886ba2 100644
--- a/dev-libs/hyphen/metadata.xml
+++ b/dev-libs/hyphen/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">hunspell</remote-id>
</upstream>
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/icu/metadata.xml
+++ b/dev-libs/icu/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/iksemel/metadata.xml b/dev-libs/iksemel/metadata.xml
index e561cde924fa..b31f6fc610f1 100644
--- a/dev-libs/iksemel/metadata.xml
+++ b/dev-libs/iksemel/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-im</herd>
<upstream>
<remote-id type="google-code">iksemel</remote-id>
<remote-id type="github">meduketto/iksemel</remote-id>
diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml
index 8b009d0c00c7..6e7dcc5972b8 100644
--- a/dev-libs/iniparser/metadata.xml
+++ b/dev-libs/iniparser/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>samba</herd>
<maintainer>
<email>samba@gentoo.org</email>
<name>Samba Team</name>
diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index 269cea16e45a..3e849d66ef8f 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
This package contains the core files to be installed for the Intel
compilers and libraries. Probably useless if installed standalone.
diff --git a/dev-libs/isl/metadata.xml b/dev-libs/isl/metadata.xml
index e4768647612b..38beb3bdf43f 100644
--- a/dev-libs/isl/metadata.xml
+++ b/dev-libs/isl/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>toolchain</herd>
<maintainer>
<email>toolchain@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/jansson/metadata.xml b/dev-libs/jansson/metadata.xml
index 1cec61ffc6d3..19197b237aaa 100644
--- a/dev-libs/jansson/metadata.xml
+++ b/dev-libs/jansson/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>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 4a500926ebea..163d51719328 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/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>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+ </maintainer>
<longdescription lang="en">
Jemalloc is a general-purpose scalable concurrent allocator
</longdescription>
diff --git a/dev-libs/jerasure/metadata.xml b/dev-libs/jerasure/metadata.xml
index 4d820980847a..ca21ac028d72 100644
--- a/dev-libs/jerasure/metadata.xml
+++ b/dev-libs/jerasure/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>openstack</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+<maintainer>
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
index 3c2c0b88b097..21ca675bbad5 100644
--- a/dev-libs/json-glib/metadata.xml
+++ b/dev-libs/json-glib/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>gnome</herd>
<maintainer>
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format described by RFC 4627. Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.
JSON-GLib uses GLib native data types and the generic value container GValue for ease of development. It also provides integration with the GObject classes for direct serialization into, and deserialization from, JSON data streams.</longdescription>
diff --git a/dev-libs/judy/metadata.xml b/dev-libs/judy/metadata.xml
index f25238699d1f..479981857bf3 100644
--- a/dev-libs/judy/metadata.xml
+++ b/dev-libs/judy/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>proxy-maintainers</herd>
<maintainer>
<email>qnikst@gentoo.org</email>
<name>Alexander Vershilov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">judy</remote-id>
</upstream>
diff --git a/dev-libs/klibc/metadata.xml b/dev-libs/klibc/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/dev-libs/klibc/metadata.xml
+++ b/dev-libs/klibc/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kernel-misc</herd>
</pkgmetadata>
diff --git a/dev-libs/kpathsea/metadata.xml b/dev-libs/kpathsea/metadata.xml
index 4c5b18fe19e5..0c43c99fb889 100644
--- a/dev-libs/kpathsea/metadata.xml
+++ b/dev-libs/kpathsea/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>tex</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/kqoauth/metadata.xml b/dev-libs/kqoauth/metadata.xml
index d5189377d9b8..d4e53894cf41 100644
--- a/dev-libs/kqoauth/metadata.xml
+++ b/dev-libs/kqoauth/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>leechcraft</herd>
<maintainer>
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
<upstream>
<remote-id type="github">kypeli/kQOAuth</remote-id>
</upstream>
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 16d6745c22cf..585ea499f3cb 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergstroem</name>
@@ -10,6 +9,10 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="snappy">support the snappy compression library</flag>
</use>
diff --git a/dev-libs/libIDL/metadata.xml b/dev-libs/libIDL/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libIDL/metadata.xml
+++ b/dev-libs/libIDL/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index c679f8767539..53f473d51c1c 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/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>proxy-maintainers</herd>
<maintainer>
<email>gokturk@binghamton.edu</email>
<name>Gokturk Yuksek</name>
<description>Primary Maintainer, Assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
support for Linux (needs kernel patches as of 2.6.12)</longdescription>
<upstream>
diff --git a/dev-libs/libappindicator/metadata.xml b/dev-libs/libappindicator/metadata.xml
index 0bf274070abc..c5b824f39f57 100644
--- a/dev-libs/libappindicator/metadata.xml
+++ b/dev-libs/libappindicator/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>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libassuan/metadata.xml b/dev-libs/libassuan/metadata.xml
index 5105fdad42ee..5a7f1ffb09bd 100644
--- a/dev-libs/libassuan/metadata.xml
+++ b/dev-libs/libassuan/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
<longdescription>
In an ideal world, Assuan is irrelevant. Assuan's primary use is to
allow a client to interact with a non-persistent server. Using Assuan,
diff --git a/dev-libs/libatasmart/metadata.xml b/dev-libs/libatasmart/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/dev-libs/libatasmart/metadata.xml
+++ b/dev-libs/libatasmart/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libatomic_ops/metadata.xml b/dev-libs/libatomic_ops/metadata.xml
index 45883ebb6e92..bced81ff4003 100644
--- a/dev-libs/libatomic_ops/metadata.xml
+++ b/dev-libs/libatomic_ops/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ivmai/libatomic_ops</remote-id>
</upstream>
diff --git a/dev-libs/libattica/metadata.xml b/dev-libs/libattica/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/dev-libs/libattica/metadata.xml
+++ b/dev-libs/libattica/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>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libbegemot/metadata.xml b/dev-libs/libbegemot/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/dev-libs/libbegemot/metadata.xml
+++ b/dev-libs/libbegemot/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libbrahe/metadata.xml b/dev-libs/libbrahe/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libbrahe/metadata.xml
+++ b/dev-libs/libbrahe/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/dev-libs/libbsd/metadata.xml
+++ b/dev-libs/libbsd/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>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libbson/metadata.xml b/dev-libs/libbson/metadata.xml
index de62fb54a58c..38608d314ae3 100644
--- a/dev-libs/libbson/metadata.xml
+++ b/dev-libs/libbson/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
@@ -11,6 +10,10 @@
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">A BSON utility library.</longdescription>
<upstream>
<remote-id type="github">mongodb/libbson</remote-id>
diff --git a/dev-libs/libbulletml/metadata.xml b/dev-libs/libbulletml/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/dev-libs/libbulletml/metadata.xml
+++ b/dev-libs/libbulletml/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libburn/metadata.xml b/dev-libs/libburn/metadata.xml
index 3bdc33646cf4..ee77ae197ae2 100644
--- a/dev-libs/libburn/metadata.xml
+++ b/dev-libs/libburn/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>media-optical</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
diff --git a/dev-libs/libcdio-paranoia/metadata.xml b/dev-libs/libcdio-paranoia/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/libcdio-paranoia/metadata.xml
+++ b/dev-libs/libcdio-paranoia/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libcdio/metadata.xml b/dev-libs/libcdio/metadata.xml
index 4c3108f98b0d..e8a90f062cae 100644
--- a/dev-libs/libcdio/metadata.xml
+++ b/dev-libs/libcdio/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="minimal">
Only build the libcdio library and little more, just to be used to
diff --git a/dev-libs/libchewing/metadata.xml b/dev-libs/libchewing/metadata.xml
index fa2e6e5c074d..a1bcd53a2964 100644
--- a/dev-libs/libchewing/metadata.xml
+++ b/dev-libs/libchewing/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="github">chewing/libchewing</remote-id>
</upstream>
diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libclc/metadata.xml
+++ b/dev-libs/libclc/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>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index 4c4e44ce9334..728844a485d2 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
@@ -10,4 +9,8 @@
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libcoyotl/metadata.xml b/dev-libs/libcoyotl/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libcoyotl/metadata.xml
+++ b/dev-libs/libcoyotl/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libcroco/metadata.xml b/dev-libs/libcroco/metadata.xml
index 3960e8e41fa6..1deb76fd6e50 100644
--- a/dev-libs/libcroco/metadata.xml
+++ b/dev-libs/libcroco/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription>
The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit that can be used by GNOME applications in need of CSS support.
diff --git a/dev-libs/libdbusmenu-qt/metadata.xml b/dev-libs/libdbusmenu-qt/metadata.xml
index 8edeb15eb987..ab2bd0b0e31e 100644
--- a/dev-libs/libdbusmenu-qt/metadata.xml
+++ b/dev-libs/libdbusmenu-qt/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">ubuntu</remote-id>
</upstream>
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index 85f766a03bc0..fd535c1ae0d2 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="gtk" restrict="&gt;=dev-libs/libdbusmenu-12.10.2-r2">Enable support for GTK+2</flag>
<flag name="gtk3">Enable support for GTK+3</flag>
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index b740f6f22383..a92de7040e12 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/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>proxy-maintainers</herd>
<maintainer>
<email>me@bearsh.org</email>
<name>Martin Gysel</name>
<description>Proxied maintainer. Assign bugs to him.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Library for communication with dive computers from various manufacturers.
</longdescription>
diff --git a/dev-libs/libdnet/metadata.xml b/dev-libs/libdnet/metadata.xml
index 08918c9b021a..c2c1b38c4ef5 100644
--- a/dev-libs/libdnet/metadata.xml
+++ b/dev-libs/libdnet/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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">libdnet</remote-id>
<remote-id type="github">dugsong/libdnet</remote-id>
diff --git a/dev-libs/libdnsres/metadata.xml b/dev-libs/libdnsres/metadata.xml
index ea027e94d2a5..f8d70bbe5b62 100644
--- a/dev-libs/libdnsres/metadata.xml
+++ b/dev-libs/libdnsres/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
Libdnsres provides a non-blocking thread-safe API for resolving DNS names.
It requires that your main application is built on top of libevent.
diff --git a/dev-libs/libdshconfig/metadata.xml b/dev-libs/libdshconfig/metadata.xml
index 348e6c4de815..77e2a9a7903e 100644
--- a/dev-libs/libdshconfig/metadata.xml
+++ b/dev-libs/libdshconfig/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>cluster</herd>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index f8c937125842..8f115fe9680e 100644
--- a/dev-libs/libdynd/metadata.xml
+++ b/dev-libs/libdynd/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
LibDyND, a component of the Blaze project, is a C++ library for
dynamic, multidimensional arrays. It is inspired by NumPy, the
diff --git a/dev-libs/libebml/metadata.xml b/dev-libs/libebml/metadata.xml
index 246a1cfe1e3c..a4dad5850e19 100644
--- a/dev-libs/libebml/metadata.xml
+++ b/dev-libs/libebml/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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libedit/metadata.xml b/dev-libs/libedit/metadata.xml
index b8f8c3c0c90e..22d9b7fb807f 100644
--- a/dev-libs/libedit/metadata.xml
+++ b/dev-libs/libedit/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
<longdescription>
GNU Readline is cool, but BSD Readline is cooler :)
Thus here is libedit by the NetBSD folks!
diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml
index eec0cf1d8c2c..d109659c9630 100644
--- a/dev-libs/libee/metadata.xml
+++ b/dev-libs/libee/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>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
<maintainer>
<email>maksbotan@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/liberasurecode/metadata.xml b/dev-libs/liberasurecode/metadata.xml
index 7d7429b3c685..75801e15b43f 100644
--- a/dev-libs/liberasurecode/metadata.xml
+++ b/dev-libs/liberasurecode/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>openstack</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer>
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
<upstream>
<remote-id type="bitbucket">tsg-/liberasurecode</remote-id>
</upstream>
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 60c7f53239ef..c5570c3e872e 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libevdev/metadata.xml b/dev-libs/libevdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libevdev/metadata.xml
+++ b/dev-libs/libevdev/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>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libevocosm/metadata.xml b/dev-libs/libevocosm/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/libevocosm/metadata.xml
+++ b/dev-libs/libevocosm/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libexecinfo/metadata.xml b/dev-libs/libexecinfo/metadata.xml
index 1792d802de96..54d5cd37d8ef 100644
--- a/dev-libs/libexecinfo/metadata.xml
+++ b/dev-libs/libexecinfo/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
<longdescription lang="en">
This is a quick-n-dirty BSD licensed clone of backtrace facility found
in the GNU libc, mainly intended for porting linuxish code to BSD
diff --git a/dev-libs/libexplain/metadata.xml b/dev-libs/libexplain/metadata.xml
index f88eefb1a68e..dbaaa9f77a7a 100644
--- a/dev-libs/libexplain/metadata.xml
+++ b/dev-libs/libexplain/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libexplain</remote-id>
</upstream>
diff --git a/dev-libs/libf2c/metadata.xml b/dev-libs/libf2c/metadata.xml
index 30770fe1c088..7c3fcff89b99 100644
--- a/dev-libs/libf2c/metadata.xml
+++ b/dev-libs/libf2c/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
A library to conver FORTRAN 77 to C/C++ source code.
</longdescription>
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 5f8cc7e5a3df..1c9e7fc0bda4 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/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>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<longdescription lang="en">
Compilers for high level languages generate code that follow certain
conventions. These conventions are necessary, in part, for separate
diff --git a/dev-libs/libgamin/metadata.xml b/dev-libs/libgamin/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/dev-libs/libgamin/metadata.xml
+++ b/dev-libs/libgamin/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libgaminggear/metadata.xml b/dev-libs/libgaminggear/metadata.xml
index 42ec8f86d101..ccf095796e34 100644
--- a/dev-libs/libgaminggear/metadata.xml
+++ b/dev-libs/libgaminggear/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>proxy-maintainers</herd>
<maintainer>
<email>dpisklov@gmail.com</email>
<name>Dmitry Pisklov</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libgaminggear</remote-id>
</upstream>
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 23cc02d7aad4..78bb0b6e9124 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/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 restrict="dev-libs/libgcrypt:0">crypto</herd>
<maintainer restrict="dev-libs/libgcrypt:11">
<email>multilib@gentoo.org</email>
<name>gx86-multilib project</name>
<description>Maintaining the binary compatibility slot.</description>
</maintainer>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 6bd7a63fff64..f5d3d73035c2 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> support</flag>
</use>
diff --git a/dev-libs/libgee/metadata.xml b/dev-libs/libgee/metadata.xml
index 7293646ec0ce..3219b27d3206 100644
--- a/dev-libs/libgee/metadata.xml
+++ b/dev-libs/libgee/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription lang="en">
libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures.
</longdescription>
diff --git a/dev-libs/libgit2-glib/metadata.xml b/dev-libs/libgit2-glib/metadata.xml
index a0afca69a125..cb82ff614286 100644
--- a/dev-libs/libgit2-glib/metadata.xml
+++ b/dev-libs/libgit2-glib/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="ssh">Enable SSH transport support</flag>
</use>
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index 780611be23d4..1f249d901339 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="common-lisp">Install common-lisp files</flag>
</use>
diff --git a/dev-libs/libgringotts/metadata.xml b/dev-libs/libgringotts/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libgringotts/metadata.xml
+++ b/dev-libs/libgringotts/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libgudev/metadata.xml b/dev-libs/libgudev/metadata.xml
index 0caa4209786b..e09f625e5cbe 100644
--- a/dev-libs/libgudev/metadata.xml
+++ b/dev-libs/libgudev/metadata.xml
@@ -5,5 +5,8 @@
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
- <herd>gnome</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/dev-libs/libgusb/metadata.xml b/dev-libs/libgusb/metadata.xml
index 5787e7504aaf..b04dce799f71 100644
--- a/dev-libs/libgusb/metadata.xml
+++ b/dev-libs/libgusb/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">hughsie/libgusb</remote-id>
</upstream>
diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml
index e64ea6610adb..cdd508e2dfe1 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag>
</use>
diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index 7dc69ce46b28..ba440cf17c79 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
<longdescription lang="en">
libiconv is a standalone package which implements the iconv() related
functions as glibc already embed. Libraries and applications needs it
diff --git a/dev-libs/libindicate-qt/metadata.xml b/dev-libs/libindicate-qt/metadata.xml
index 887d1ab3b568..374796515464 100644
--- a/dev-libs/libindicate-qt/metadata.xml
+++ b/dev-libs/libindicate-qt/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">libindicate-qt</remote-id>
</upstream>
diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
index 14cb6a728c3b..e4b40e293024 100644
--- a/dev-libs/libindicate/metadata.xml
+++ b/dev-libs/libindicate/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
</use>
diff --git a/dev-libs/libindicator/metadata.xml b/dev-libs/libindicator/metadata.xml
index 97d25986e74d..13bb290c634a 100644
--- a/dev-libs/libindicator/metadata.xml
+++ b/dev-libs/libindicator/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>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index 42473bf06aa3..3ac4070c0fcf 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/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>gnome</herd>
-<herd>x11</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libintl/metadata.xml b/dev-libs/libintl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libintl/metadata.xml
+++ b/dev-libs/libintl/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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libisoburn/metadata.xml b/dev-libs/libisoburn/metadata.xml
index 2a7ab78ef73b..4a6b50940a65 100644
--- a/dev-libs/libisoburn/metadata.xml
+++ b/dev-libs/libisoburn/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>media-optical</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
diff --git a/dev-libs/libisofs/metadata.xml b/dev-libs/libisofs/metadata.xml
index 3923327f830f..581670698a81 100644
--- a/dev-libs/libisofs/metadata.xml
+++ b/dev-libs/libisofs/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>media-optical</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/libixion/metadata.xml
+++ b/dev-libs/libixion/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libjit/metadata.xml b/dev-libs/libjit/metadata.xml
index 9d507edf580b..01bc9f1e34fd 100644
--- a/dev-libs/libjit/metadata.xml
+++ b/dev-libs/libjit/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>dotnet</herd>
+<maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+</maintainer>
<use>
<flag name="interpreter">Enable the libjit interpreter</flag>
<flag name="long-double">Enable the use of long double for jit_nfloat</flag>
diff --git a/dev-libs/libksba/metadata.xml b/dev-libs/libksba/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/libksba/metadata.xml
+++ b/dev-libs/libksba/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>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/liblist/metadata.xml b/dev-libs/liblist/metadata.xml
index 34c84d91eed5..cbda8f0829fb 100644
--- a/dev-libs/liblist/metadata.xml
+++ b/dev-libs/liblist/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>dev-tools</herd>
<maintainer>
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 2db636027c31..d0fc03621788 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
@@ -11,6 +10,10 @@
<name>Thomas D. (Whissi)</name>
<description>Proxy-Maintainer, CC. bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="rfc3195">
Enables RFC 3195 protocol (aka syslog-reliable) support.
diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml
index eec0cf1d8c2c..d109659c9630 100644
--- a/dev-libs/liblognorm/metadata.xml
+++ b/dev-libs/liblognorm/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>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
<maintainer>
<email>maksbotan@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/liblouis/metadata.xml b/dev-libs/liblouis/metadata.xml
index 2d30215f74d8..97bda8ff160b 100644
--- a/dev-libs/liblouis/metadata.xml
+++ b/dev-libs/liblouis/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>accessibility</herd>
+ <maintainer>
+ <email>accessibility@gentoo.org</email>
+ <name>Gentoo Accessibility Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">liblouis/liblouis</remote-id>
</upstream>
diff --git a/dev-libs/libltdl/metadata.xml b/dev-libs/libltdl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libltdl/metadata.xml
+++ b/dev-libs/libltdl/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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libmal/metadata.xml b/dev-libs/libmal/metadata.xml
index 228404d3a4b2..097975e3adc2 100644
--- a/dev-libs/libmal/metadata.xml
+++ b/dev-libs/libmal/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>pda</herd>
</pkgmetadata>
diff --git a/dev-libs/libmateweather/metadata.xml b/dev-libs/libmateweather/metadata.xml
index d2f9020ebfb1..573919207d29 100644
--- a/dev-libs/libmateweather/metadata.xml
+++ b/dev-libs/libmateweather/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>mate</herd>
+ <maintainer>
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">mate-desktop/libmateweather</remote-id>
</upstream>
diff --git a/dev-libs/libmaxminddb/metadata.xml b/dev-libs/libmaxminddb/metadata.xml
index 0c050f93d9a9..c5166c8c1f70 100644
--- a/dev-libs/libmaxminddb/metadata.xml
+++ b/dev-libs/libmaxminddb/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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">maxmind/libmaxminddb</remote-id>
</upstream>
diff --git a/dev-libs/libmcrypt/metadata.xml b/dev-libs/libmcrypt/metadata.xml
index 0549001de3c4..59168343c4b5 100644
--- a/dev-libs/libmcrypt/metadata.xml
+++ b/dev-libs/libmcrypt/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>crypto</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mcrypt</remote-id>
</upstream>
diff --git a/dev-libs/libmimedir/metadata.xml b/dev-libs/libmimedir/metadata.xml
index 762857812a3c..8e3fb75ee30b 100644
--- a/dev-libs/libmimedir/metadata.xml
+++ b/dev-libs/libmimedir/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>pda</herd>
<upstream>
<remote-id type="sourceforge">libmimedir</remote-id>
</upstream>
diff --git a/dev-libs/libmoe/metadata.xml b/dev-libs/libmoe/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/libmoe/metadata.xml
+++ b/dev-libs/libmoe/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>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libnatspec/metadata.xml b/dev-libs/libnatspec/metadata.xml
index 773243d1cf6f..2154a4efd511 100644
--- a/dev-libs/libnatspec/metadata.xml
+++ b/dev-libs/libnatspec/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">natspec</remote-id>
</upstream>
diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 3b7135cd9f7c..9001c663b30b 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<use>
<flag name="doc">Install development documentation</flag>
<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
diff --git a/dev-libs/liboil/metadata.xml b/dev-libs/liboil/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/dev-libs/liboil/metadata.xml
+++ b/dev-libs/liboil/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
index 50bec160f4c9..2ef1ad0feb53 100644
--- a/dev-libs/liboobs/metadata.xml
+++ b/dev-libs/liboobs/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>lxqt</herd>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
<longdescription lang="en">
Liboobs is a wrapping library to the System Tools Backends, it will
provide easy to access GObjects to system configuration details, like
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libotf/metadata.xml b/dev-libs/libotf/metadata.xml
index cdee2535d93e..9c83c2a34552 100644
--- a/dev-libs/libotf/metadata.xml
+++ b/dev-libs/libotf/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>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index 4330eeef4bae..67cf00ddf938 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<longdescription>
Library implementing a small layer on top of PKCS#11 API to make
using PKCS#11 implementations easier.
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 7c5ad801b1b8..7c75e8f9976c 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="bzip2">
Add support for pcregrep command to search within
diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index 1ee0353a4bc6..7f4ca34d3c4f 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="glade">Install the glade catalog</flag>
<flag name="python">Build support for loading <pkg>dev-lang/python</pkg>
diff --git a/dev-libs/libpipeline/metadata.xml b/dev-libs/libpipeline/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-libs/libpipeline/metadata.xml
+++ b/dev-libs/libpipeline/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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libpqxx/metadata.xml b/dev-libs/libpqxx/metadata.xml
index dc20b00f6741..3613c567cd49 100644
--- a/dev-libs/libpqxx/metadata.xml
+++ b/dev-libs/libpqxx/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>postgresql</herd>
+ <maintainer>
+ <email>pgsql-bugs@gentoo.org</email>
+ <name>PostgreSQL and Related Package Development</name>
+ </maintainer>
<longdescription>
libpqxx is the official C++ client API for PostgreSQL. If you are
writing software in C++ that needs to access databases managed by
diff --git a/dev-libs/libpthread-stubs/metadata.xml b/dev-libs/libpthread-stubs/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/libpthread-stubs/metadata.xml
+++ b/dev-libs/libpthread-stubs/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>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libpwquality/metadata.xml b/dev-libs/libpwquality/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libpwquality/metadata.xml
+++ b/dev-libs/libpwquality/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml
index 2b2f83827853..6ceee28570c0 100644
--- a/dev-libs/libqtxdg/metadata.xml
+++ b/dev-libs/libqtxdg/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>lxqt</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libqzeitgeist/metadata.xml b/dev-libs/libqzeitgeist/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/libqzeitgeist/metadata.xml
+++ b/dev-libs/libqzeitgeist/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libreport/metadata.xml b/dev-libs/libreport/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/libreport/metadata.xml
+++ b/dev-libs/libreport/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/librevenge/metadata.xml b/dev-libs/librevenge/metadata.xml
index b373b8b44128..1ce2220fcf62 100644
--- a/dev-libs/librevenge/metadata.xml
+++ b/dev-libs/librevenge/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libroadnav/metadata.xml b/dev-libs/libroadnav/metadata.xml
index 9ebfaf66a151..7bcd1bd2a2fc 100644
--- a/dev-libs/libroadnav/metadata.xml
+++ b/dev-libs/libroadnav/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>proxy-maintainers</herd>
<maintainer>
<email>andrew.cremins@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">roadnav</remote-id>
</upstream>
diff --git a/dev-libs/librra/metadata.xml b/dev-libs/librra/metadata.xml
index 4c4dfee99541..bc61acb31344 100644
--- a/dev-libs/librra/metadata.xml
+++ b/dev-libs/librra/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>pda</herd>
<use>
<flag name="recurrence">Enable recurrence support (EXPERIMENTAL)</flag>
</use>
diff --git a/dev-libs/librtfcomp/metadata.xml b/dev-libs/librtfcomp/metadata.xml
index ba58102c22c2..5cc3b241b374 100644
--- a/dev-libs/librtfcomp/metadata.xml
+++ b/dev-libs/librtfcomp/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>pda</herd>
<upstream>
<remote-id type="sourceforge">synce</remote-id>
</upstream>
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 60835a2cb1e4..714e4710132a 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="asm">Enable x86_64 assembly optimisation</flag>
<flag name="endomorphism">Enable endomorphism</flag>
diff --git a/dev-libs/libserialport/metadata.xml b/dev-libs/libserialport/metadata.xml
index 92114080841c..5fd50e81f42b 100644
--- a/dev-libs/libserialport/metadata.xml
+++ b/dev-libs/libserialport/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>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libsigc++/metadata.xml b/dev-libs/libsigc++/metadata.xml
index e6cf74a913d0..1200fd41eb8c 100644
--- a/dev-libs/libsigc++/metadata.xml
+++ b/dev-libs/libsigc++/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>gnome-mm</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libsigc</remote-id>
</upstream>
diff --git a/dev-libs/libsigsegv/metadata.xml b/dev-libs/libsigsegv/metadata.xml
index 9800397a8c40..8392bffc7b79 100644
--- a/dev-libs/libsigsegv/metadata.xml
+++ b/dev-libs/libsigsegv/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>common-lisp</herd>
+ <maintainer>
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+ </maintainer>
<longdescription>
This is a library for handling page faults in user mode. A page fault occurs
when a program tries to access to a region of memory that is currently not
diff --git a/dev-libs/libspnav/metadata.xml b/dev-libs/libspnav/metadata.xml
index 14da66cc7fac..609e67bba838 100644
--- a/dev-libs/libspnav/metadata.xml
+++ b/dev-libs/libspnav/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>anthoine.bourgeois@gmail.com</email>
<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
The libspnav library is provided as a replacement of the magellan
library. It provides a cleaner, and more orthogonal interface. libspnav
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/libspt/metadata.xml
+++ b/dev-libs/libspt/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>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/libtar/metadata.xml b/dev-libs/libtar/metadata.xml
index 2644f03ae0e6..4a53f22f7167 100644
--- a/dev-libs/libtar/metadata.xml
+++ b/dev-libs/libtar/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>proxy-maintainers</herd>
<maintainer>
<email>sdnick484@gmail.com</email>
<name>Nick Andrade</name>
<description>Active Maintainer, Assign bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/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>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libtecla/metadata.xml b/dev-libs/libtecla/metadata.xml
index 63bef1b93f80..a359909c8b5b 100644
--- a/dev-libs/libtecla/metadata.xml
+++ b/dev-libs/libtecla/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
+<maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
<longdescription lang="en">
The tecla library provides UNIX and LINUX programs with interactive
command line editing facilities, similar to those of the UNIX tcsh
diff --git a/dev-libs/libtermkey/metadata.xml b/dev-libs/libtermkey/metadata.xml
index e76fa845400b..e6836a913303 100644
--- a/dev-libs/libtermkey/metadata.xml
+++ b/dev-libs/libtermkey/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>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
<use>
<flag name="demos">Install demos, which pulls in <pkg>dev-libs/glib</pkg></flag>
</use>
diff --git a/dev-libs/libunique/metadata.xml b/dev-libs/libunique/metadata.xml
index 18d1a81735d6..a3834afd39ca 100644
--- a/dev-libs/libunique/metadata.xml
+++ b/dev-libs/libunique/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription lang="en">
Unique is a library for writing single instance application. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance.
</longdescription>
diff --git a/dev-libs/libunistring/metadata.xml b/dev-libs/libunistring/metadata.xml
index 260b66c76dc4..7b0c1367fc12 100644
--- a/dev-libs/libunistring/metadata.xml
+++ b/dev-libs/libunistring/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>scheme</herd>
+<maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+</maintainer>
<longdescription lang="en">
Text files are nowadays usually encoded in Unicode, and may consist of very
different scripts – from Latin letters to Chinese Hanzi –, with many kinds
diff --git a/dev-libs/libusb-compat/metadata.xml b/dev-libs/libusb-compat/metadata.xml
index 705c20c4a276..bd474ff9e592 100644
--- a/dev-libs/libusb-compat/metadata.xml
+++ b/dev-libs/libusb-compat/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>peter@stuge.se</email>
<name>Peter Stuge</name>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libusb</remote-id>
</upstream>
diff --git a/dev-libs/libusb/metadata.xml b/dev-libs/libusb/metadata.xml
index 705c20c4a276..bd474ff9e592 100644
--- a/dev-libs/libusb/metadata.xml
+++ b/dev-libs/libusb/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>peter@stuge.se</email>
<name>Peter Stuge</name>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libusb</remote-id>
</upstream>
diff --git a/dev-libs/libusbhp/metadata.xml b/dev-libs/libusbhp/metadata.xml
index b61166215c7d..d5324b90b8b1 100644
--- a/dev-libs/libusbhp/metadata.xml
+++ b/dev-libs/libusbhp/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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libvolume_id/metadata.xml b/dev-libs/libvolume_id/metadata.xml
index 33d86159cefd..1af443ee5a66 100644
--- a/dev-libs/libvolume_id/metadata.xml
+++ b/dev-libs/libvolume_id/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>bsd</herd>
+ <maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+ </maintainer>
<longdescription lang="en">
Provided file system type information for systems that don't have udev.
</longdescription>
diff --git a/dev-libs/libvterm-neovim/metadata.xml b/dev-libs/libvterm-neovim/metadata.xml
index 71d319114053..3f95966e263f 100644
--- a/dev-libs/libvterm-neovim/metadata.xml
+++ b/dev-libs/libvterm-neovim/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>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
index 71d319114053..3f95966e263f 100644
--- a/dev-libs/libvterm/metadata.xml
+++ b/dev-libs/libvterm/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>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libwacom/metadata.xml b/dev-libs/libwacom/metadata.xml
index ad51e5e10a70..7f93620102a6 100644
--- a/dev-libs/libwacom/metadata.xml
+++ b/dev-libs/libwacom/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/libxml2/metadata.xml b/dev-libs/libxml2/metadata.xml
index 4d835067a021..9d35137ea87b 100644
--- a/dev-libs/libxml2/metadata.xml
+++ b/dev-libs/libxml2/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
</upstream>
diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libzeitgeist/metadata.xml b/dev-libs/libzeitgeist/metadata.xml
index e32a5e8e4cd5..1736117011d5 100644
--- a/dev-libs/libzeitgeist/metadata.xml
+++ b/dev-libs/libzeitgeist/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>desktop-misc</herd>
<maintainer>
<email>eva@gentoo.org</email>
<name>Gilles Dartiguelongue</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">libzeitgeist</remote-id>
</upstream>
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index bfccf8675474..278ae839134f 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/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>kde</herd>
<maintainer>
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/link-grammar/metadata.xml b/dev-libs/link-grammar/metadata.xml
index 799d5bac3ffa..757f3e15d57b 100644
--- a/dev-libs/link-grammar/metadata.xml
+++ b/dev-libs/link-grammar/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>gnome-office</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
The Link Grammar Parser is a syntactic parser of English, based on link
grammar, an original theory of English syntax. The system is written in
diff --git a/dev-libs/log4cpp/metadata.xml b/dev-libs/log4cpp/metadata.xml
index bafe48212a72..0b9f07c65625 100644
--- a/dev-libs/log4cpp/metadata.xml
+++ b/dev-libs/log4cpp/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">log4cpp</remote-id>
</upstream>
diff --git a/dev-libs/log4cxx/metadata.xml b/dev-libs/log4cxx/metadata.xml
index 637de3e45e09..1ec5de3cc946 100644
--- a/dev-libs/log4cxx/metadata.xml
+++ b/dev-libs/log4cxx/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
<use>
<flag name="smtp" restrict="&lt;dev-libs/log4cxx-0.10">Offer SMTP support via
<pkg>net-libs/libsmtp</pkg></flag>
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 47417744e979..f067f7713645 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<use>
<flag name="X">
Builds the Graphical User Interface API and utilities for the
diff --git a/dev-libs/maloc/metadata.xml b/dev-libs/maloc/metadata.xml
index 897aa2e6b59a..721f543292bb 100644
--- a/dev-libs/maloc/metadata.xml
+++ b/dev-libs/maloc/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/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>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/matrixssl/metadata.xml b/dev-libs/matrixssl/metadata.xml
index 5c40e771595f..5fd50e81f42b 100644
--- a/dev-libs/matrixssl/metadata.xml
+++ b/dev-libs/matrixssl/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>embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index 5eb541d497f3..3e24b325ab80 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/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>proxy-maintainers</herd>
<maintainer>
<email>ruepel@gmx.li</email>
<name>Rüpel</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/mongo-c-driver/metadata.xml b/dev-libs/mongo-c-driver/metadata.xml
index a1f0f88321d3..b0e4301c5a2d 100644
--- a/dev-libs/mongo-c-driver/metadata.xml
+++ b/dev-libs/mongo-c-driver/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
@@ -10,6 +9,10 @@
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/dev-libs/mongo-cxx-driver/metadata.xml b/dev-libs/mongo-cxx-driver/metadata.xml
index 2a9f2397361b..0a7b29dbd342 100644
--- a/dev-libs/mongo-cxx-driver/metadata.xml
+++ b/dev-libs/mongo-cxx-driver/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
@@ -10,6 +9,10 @@
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/dev-libs/mpc/metadata.xml b/dev-libs/mpc/metadata.xml
index 5961aa214265..e50f1a1c98ad 100644
--- a/dev-libs/mpc/metadata.xml
+++ b/dev-libs/mpc/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>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/mpfr/metadata.xml b/dev-libs/mpfr/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-libs/mpfr/metadata.xml
+++ b/dev-libs/mpfr/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>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/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>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index e70ecc2e1e74..0e0fc8aee596 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/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>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index 74d9257900cf..937c6dbf9feb 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>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index ef6105728a67..9f7a41fcb814 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/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>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+</maintainer>
<use>
<flag name="cacert">
Include root/class3 certs from CAcert (http://http://www.cacert.org/) and
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index 480588cfc0a6..31365b5b5f41 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/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>sci-mathematics</herd>
-<herd>cpp</herd>
+<maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+</maintainer>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
<longdescription lang="en">
NTL is a high-performance, portable C++ library providing data
structures and algorithms for manipulating signed, arbitrary length
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index cbabf9d6775f..403d121b84d7 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/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>cjk</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
<longdescription>
Oniguruma is a regular expression library. The characteristics of
this library is that different character encoding for every regular
diff --git a/dev-libs/opencryptoki/metadata.xml b/dev-libs/opencryptoki/metadata.xml
index 83bdc03df715..3097c0c6f141 100644
--- a/dev-libs/opencryptoki/metadata.xml
+++ b/dev-libs/opencryptoki/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="tpm">
Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg>
diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml
index a67417b00a07..3d96760acafe 100644
--- a/dev-libs/openct/metadata.xml
+++ b/dev-libs/openct/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="pcsc-lite">
Build a driver library for <pkg>sys-apps/pcsc-lite</pkg>,
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 355eb11bd0c4..6ffd741dbcd7 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<longdescription>
OpenSC is a library for accessing SmartCard devices. It is also
the core library of the OpenSC project.
diff --git a/dev-libs/openspecfun/metadata.xml b/dev-libs/openspecfun/metadata.xml
index 3237bd77151c..dcedd29b4acf 100644
--- a/dev-libs/openspecfun/metadata.xml
+++ b/dev-libs/openspecfun/metadata.xml
@@ -5,7 +5,10 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">JuliaLang/openspecfun</remote-id>
</upstream>
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index b7cc1cd0ffd4..a08ea958e0e3 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
<flag name="bindist">Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
diff --git a/dev-libs/pakchois/metadata.xml b/dev-libs/pakchois/metadata.xml
index b02ffbb5d348..5fe73717c767 100644
--- a/dev-libs/pakchois/metadata.xml
+++ b/dev-libs/pakchois/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>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/pcl/metadata.xml b/dev-libs/pcl/metadata.xml
index 00c0b469b624..4b8f0d895ed0 100644
--- a/dev-libs/pcl/metadata.xml
+++ b/dev-libs/pcl/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>proxy-maintainers</herd>
<maintainer>
<email>longlene@gmail.com</email>
<name>Lixiao Chen</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
The Portable Coroutine Library (PCL) implements the low level
functionality for coroutines
diff --git a/dev-libs/pcre++/metadata.xml b/dev-libs/pcre++/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/pcre++/metadata.xml
+++ b/dev-libs/pcre++/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 0f458687a8b8..12893a226ef0 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="nss">Enable NSS crypto engine</flag>
</use>
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index ef852f1d155f..b197be21d9e1 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -5,7 +5,10 @@
<email>tommy@gentoo.org</email>
<name>Thomas Sachau (Tommy[D])</name>
</maintainer>
- <herd>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription>
POCO, the C++ Portable Components, is a collection of open source
C++ class libraries that simplify and accelerate the development of
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
index bee9f9ae6f02..aff39ca735f4 100644
--- a/dev-libs/popt/metadata.xml
+++ b/dev-libs/popt/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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/ppl/metadata.xml b/dev-libs/ppl/metadata.xml
index 3584f23ed054..f3431342473e 100644
--- a/dev-libs/ppl/metadata.xml
+++ b/dev-libs/ppl/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>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
<use>
<flag name="lpsol">Build the ppl_lpsol linear programming problem solver</flag>
</use>
diff --git a/dev-libs/pslib/metadata.xml b/dev-libs/pslib/metadata.xml
index f8f5d4685cef..2728fd3f3a73 100644
--- a/dev-libs/pslib/metadata.xml
+++ b/dev-libs/pslib/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>printing</herd>
- <herd>tex</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pslib</remote-id>
</upstream>
diff --git a/dev-libs/ptexenc/metadata.xml b/dev-libs/ptexenc/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/dev-libs/ptexenc/metadata.xml
+++ b/dev-libs/ptexenc/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/pth/metadata.xml b/dev-libs/pth/metadata.xml
index d68fe974c15a..dd564d89eb81 100644
--- a/dev-libs/pth/metadata.xml
+++ b/dev-libs/pth/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>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/ptypes/metadata.xml b/dev-libs/ptypes/metadata.xml
index 8f74a5e3c99e..d303641e6256 100644
--- a/dev-libs/ptypes/metadata.xml
+++ b/dev-libs/ptypes/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ptypes</remote-id>
</upstream>
diff --git a/dev-libs/pugixml/metadata.xml b/dev-libs/pugixml/metadata.xml
index ec127a995bb0..03565c976706 100644
--- a/dev-libs/pugixml/metadata.xml
+++ b/dev-libs/pugixml/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>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="github">zeux/pugixml</remote-id>
</upstream>
diff --git a/dev-libs/purpose/metadata.xml b/dev-libs/purpose/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-libs/purpose/metadata.xml
+++ b/dev-libs/purpose/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/qcustomplot/metadata.xml b/dev-libs/qcustomplot/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/dev-libs/qcustomplot/metadata.xml
+++ b/dev-libs/qcustomplot/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml
index 8f60b5cd0e21..c0053edfafa0 100644
--- a/dev-libs/qjson/metadata.xml
+++ b/dev-libs/qjson/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>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">flavio/qjson</remote-id>
<bugs-to>https://github.com/flavio/qjson/issues</bugs-to>
diff --git a/dev-libs/qoauth/metadata.xml b/dev-libs/qoauth/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-libs/qoauth/metadata.xml
+++ b/dev-libs/qoauth/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>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/qof/metadata.xml b/dev-libs/qof/metadata.xml
index 669f23da60ac..fe3dc94b2bcd 100644
--- a/dev-libs/qof/metadata.xml
+++ b/dev-libs/qof/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>gnome-office</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/qqwing/metadata.xml b/dev-libs/qqwing/metadata.xml
index 36fc81a79830..06c7b41d4ad9 100644
--- a/dev-libs/qqwing/metadata.xml
+++ b/dev-libs/qqwing/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">stephenostermiller/qqwing</remote-id>
</upstream>
diff --git a/dev-libs/qrosscore/metadata.xml b/dev-libs/qrosscore/metadata.xml
index ae36ab9f924e..91d2c3e29fbc 100644
--- a/dev-libs/qrosscore/metadata.xml
+++ b/dev-libs/qrosscore/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
<longdescription lang="en">
Qross is a KDE-free version of Kross.
</longdescription>
diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qrosspython/metadata.xml
index 731cdfc65303..83d17c265f95 100644
--- a/dev-libs/qrosspython/metadata.xml
+++ b/dev-libs/qrosspython/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
<longdescription lang="en">
Python interpreter for Qross.
</longdescription>
diff --git a/dev-libs/quantlib/metadata.xml b/dev-libs/quantlib/metadata.xml
index 061f38a0f8d6..f35bca0232c6 100644
--- a/dev-libs/quantlib/metadata.xml
+++ b/dev-libs/quantlib/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription>
QuantLib (http://quantlib.org/) is a C++ library for financial
quantitative analysts and developers.
diff --git a/dev-libs/quazip/metadata.xml b/dev-libs/quazip/metadata.xml
index 3a49663f2818..8e23af761756 100644
--- a/dev-libs/quazip/metadata.xml
+++ b/dev-libs/quazip/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>sci</herd>
<maintainer>
<email>sci@gentoo.org</email>
</maintainer>
diff --git a/dev-libs/rapidxml/metadata.xml b/dev-libs/rapidxml/metadata.xml
index 87b1d22e567d..d4001df068f7 100644
--- a/dev-libs/rapidxml/metadata.xml
+++ b/dev-libs/rapidxml/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">rapidxml</remote-id>
</upstream>
diff --git a/dev-libs/rasqal/metadata.xml b/dev-libs/rasqal/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/rasqal/metadata.xml
+++ b/dev-libs/rasqal/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index fffcfc8b794e..7442547d826a 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>chromium</herd>
+ <maintainer>
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/redland-bindings/metadata.xml b/dev-libs/redland-bindings/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/redland-bindings/metadata.xml
+++ b/dev-libs/redland-bindings/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/redland/metadata.xml b/dev-libs/redland/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/dev-libs/redland/metadata.xml
+++ b/dev-libs/redland/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/rlog/metadata.xml b/dev-libs/rlog/metadata.xml
index cc9a8c3e469b..650e24b29ebe 100644
--- a/dev-libs/rlog/metadata.xml
+++ b/dev-libs/rlog/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">rlog</remote-id>
</upstream>
diff --git a/dev-libs/sblim-sfcc/metadata.xml b/dev-libs/sblim-sfcc/metadata.xml
index f6583660b6d1..b4fc25bb64b9 100644
--- a/dev-libs/sblim-sfcc/metadata.xml
+++ b/dev-libs/sblim-sfcc/metadata.xml
@@ -4,7 +4,10 @@
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sblim</remote-id>
</upstream>
diff --git a/dev-libs/serd/metadata.xml b/dev-libs/serd/metadata.xml
index 1026eab86322..ac64c9c43fec 100644
--- a/dev-libs/serd/metadata.xml
+++ b/dev-libs/serd/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription lang="en">
Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples.
diff --git a/dev-libs/sni-qt/metadata.xml b/dev-libs/sni-qt/metadata.xml
index 010c945c7fa2..9217047479fb 100644
--- a/dev-libs/sni-qt/metadata.xml
+++ b/dev-libs/sni-qt/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">sni-qt</remote-id>
</upstream>
diff --git a/dev-libs/socketstream/metadata.xml b/dev-libs/socketstream/metadata.xml
index 437cf706948d..10f0b78284c6 100644
--- a/dev-libs/socketstream/metadata.xml
+++ b/dev-libs/socketstream/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">socketstream</remote-id>
</upstream>
diff --git a/dev-libs/sord/metadata.xml b/dev-libs/sord/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/dev-libs/sord/metadata.xml
+++ b/dev-libs/sord/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/stlsoft/metadata.xml b/dev-libs/stlsoft/metadata.xml
index 4241f4f95923..29c5f0644134 100644
--- a/dev-libs/stlsoft/metadata.xml
+++ b/dev-libs/stlsoft/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>proxy-maintainers</herd>
<maintainer>
<email>dav.daemon@gmail.com</email>
<name>Dmitriy Vilkov</name>
<description>Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/dev-libs/tinyxml2/metadata.xml b/dev-libs/tinyxml2/metadata.xml
index 4af0dabc8e1e..c5bb5639187c 100644
--- a/dev-libs/tinyxml2/metadata.xml
+++ b/dev-libs/tinyxml2/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>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="github">leethomason/tinyxml2</remote-id>
</upstream>
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 5a94337ca559..f7984aed6a63 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -5,7 +5,6 @@
<email>hd_brummy@gentoo.org</email>
<name>Joerg Bornkessel</name>
</maintainer>
- <herd>media-tv</herd>
<use>
<flag name="server">Enable tntnet server daemon</flag>
</use>
diff --git a/dev-libs/totem-pl-parser/metadata.xml b/dev-libs/totem-pl-parser/metadata.xml
index 90786c3676d9..6df543fba0c5 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="archive">Enables support for accessing media files in archives
transparently via <pkg>app-arch/libarchive</pkg></flag>
diff --git a/dev-libs/tre/metadata.xml b/dev-libs/tre/metadata.xml
index f23b9cae1593..7cb4266e65a4 100644
--- a/dev-libs/tre/metadata.xml
+++ b/dev-libs/tre/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/tvmet/metadata.xml b/dev-libs/tvmet/metadata.xml
index f33bab03deb3..7a9a5540d956 100644
--- a/dev-libs/tvmet/metadata.xml
+++ b/dev-libs/tvmet/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">tvmet</remote-id>
</upstream>
diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml
index bfe4d0155d48..e314a6ffdf29 100644
--- a/dev-libs/uchardet/metadata.xml
+++ b/dev-libs/uchardet/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>rion4ik@gmail.com</email>
<name>Rion</name>
@@ -10,6 +9,10 @@
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">BYVoid/uchardet</remote-id>
</upstream>
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index 076cf488c9c0..b2eeac637687 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andrei Vinogradov</name>
@@ -10,6 +9,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
<flag name="socks">Build with socks proxy support</flag>
</use>
diff --git a/dev-libs/unibilium/metadata.xml b/dev-libs/unibilium/metadata.xml
index dd59dfe14476..3c9d669e4970 100644
--- a/dev-libs/unibilium/metadata.xml
+++ b/dev-libs/unibilium/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>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">mauke/unibilium</remote-id>
</upstream>
diff --git a/dev-libs/urdfdom_headers/metadata.xml b/dev-libs/urdfdom_headers/metadata.xml
index 2984f253c23b..ebe84a919917 100644
--- a/dev-libs/urdfdom_headers/metadata.xml
+++ b/dev-libs/urdfdom_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>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ros/urdfdom_headers</remote-id>
</upstream>
diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index a6cb317dc98b..86c267fa7393 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/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>base-system</herd>
+<maintainer>
+<email>base-system@gentoo.org</email>
+<name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
</use>
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 3e931e3686e7..4363fb062dba 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/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>proxy-maintainers</herd>
<maintainer>
<email>Yamakuzure@gmx.net</email>
<name>Sven Eden</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index 85dd9367f83e..874d5c56cae5 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/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>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/vdk/metadata.xml b/dev-libs/vdk/metadata.xml
index e111126efa21..e097d1417481 100644
--- a/dev-libs/vdk/metadata.xml
+++ b/dev-libs/vdk/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>lang-misc</herd>
<upstream>
<remote-id type="sourceforge">vdklib</remote-id>
</upstream>
diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/dev-libs/wayland/metadata.xml
+++ b/dev-libs/wayland/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>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index dd18351dc2cc..44827497918a 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="colord">Allow setting color managment</flag>
<flag name="drm">Enable drm compositor support</flag>
diff --git a/dev-libs/wnn7sdk/metadata.xml b/dev-libs/wnn7sdk/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/dev-libs/wnn7sdk/metadata.xml
+++ b/dev-libs/wnn7sdk/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>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/xalan-c/metadata.xml b/dev-libs/xalan-c/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-libs/xalan-c/metadata.xml
+++ b/dev-libs/xalan-c/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-libs/xapian-bindings/metadata.xml b/dev-libs/xapian-bindings/metadata.xml
index 0441f1355104..530e27530e1a 100644
--- a/dev-libs/xapian-bindings/metadata.xml
+++ b/dev-libs/xapian-bindings/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index ca3e85bc56d8..0edead8a478f 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Xapian is an Open Source Probabilistic Information Retrieval library,
released under the GPL. It's written in C++, with bindings to allow use
diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index b6a7983cc612..12afeaffa1f3 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/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>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
<longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
<use>
<flag name="iconv">Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index c4c05198b310..5a4003b0adb2 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<use>
<flag name="xalan">Enable support for XSLT and XPath parsing
by <pkg>dev-libs/xalan-c</pkg></flag>
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index b4229edcd38f..e2c9f21b69f3 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/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>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="gcrypt">Install xmlsec-gcrypt library</flag>
<flag name="gnutls">Install xmlsec-gnutls library</flag>
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
index aad795610fd3..c294ff8fb62c 100644
--- a/dev-libs/xmlwrapp/metadata.xml
+++ b/dev-libs/xmlwrapp/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<bugs-to>https://github.com/vslavik/xmlwrapp/issues</bugs-to>
<remote-id type="github">vslavik/xmlwrapp</remote-id>
diff --git a/dev-libs/xplc/metadata.xml b/dev-libs/xplc/metadata.xml
index d151eb9a26d0..000947dacee4 100644
--- a/dev-libs/xplc/metadata.xml
+++ b/dev-libs/xplc/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription>cross platform lightweight components library for C++</longdescription>
<upstream>
<remote-id type="sourceforge">xplc</remote-id>
diff --git a/dev-libs/xqilla/metadata.xml b/dev-libs/xqilla/metadata.xml
index af34b3930505..4a58f495d9e6 100644
--- a/dev-libs/xqilla/metadata.xml
+++ b/dev-libs/xqilla/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<use>
<flag name="faxpp">Use <pkg>dev-libs/faxpp</pkg> instead of Xerces-C for
certain tasks</flag>
diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml
index 429319866423..65823fd7250a 100644
--- a/dev-libs/yajl/metadata.xml
+++ b/dev-libs/yajl/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>ruby</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">lloyd/yajl</remote-id>
</upstream>
diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml
index a0ea0d126771..171968161858 100644
--- a/dev-libs/zthread/metadata.xml
+++ b/dev-libs/zthread/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>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">zthread</remote-id>
</upstream>