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 /sys-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 'sys-libs')
-rw-r--r--sys-libs/argp-standalone/metadata.xml5
-rw-r--r--sys-libs/binutils-libs/metadata.xml5
-rw-r--r--sys-libs/cracklib/metadata.xml5
-rw-r--r--sys-libs/csu/metadata.xml5
-rw-r--r--sys-libs/db/metadata.xml5
-rw-r--r--sys-libs/e2fsprogs-libs/metadata.xml5
-rw-r--r--sys-libs/freeipmi/metadata.xml5
-rw-r--r--sys-libs/gdbm/metadata.xml5
-rw-r--r--sys-libs/glibc/metadata.xml5
-rw-r--r--sys-libs/gpm/metadata.xml5
-rw-r--r--sys-libs/kpmcore/metadata.xml5
-rw-r--r--sys-libs/ldb/metadata.xml5
-rw-r--r--sys-libs/lib-compat-loki/metadata.xml5
-rw-r--r--sys-libs/lib-compat/metadata.xml5
-rw-r--r--sys-libs/libaal/metadata.xml5
-rw-r--r--sys-libs/libapparmor/metadata.xml5
-rw-r--r--sys-libs/libavc1394/metadata.xml5
-rw-r--r--sys-libs/libcap-ng/metadata.xml5
-rw-r--r--sys-libs/libcap/metadata.xml5
-rw-r--r--sys-libs/libcxx/metadata.xml5
-rw-r--r--sys-libs/libcxxrt/metadata.xml5
-rw-r--r--sys-libs/libfreevec/metadata.xml5
-rw-r--r--sys-libs/libhugetlbfs/metadata.xml5
-rw-r--r--sys-libs/libieee1284/metadata.xml5
-rw-r--r--sys-libs/libkudzu/metadata.xml5
-rw-r--r--sys-libs/libmath++/metadata.xml5
-rw-r--r--sys-libs/libosinfo/metadata.xml5
-rw-r--r--sys-libs/libraw1394/metadata.xml5
-rw-r--r--sys-libs/librtas/metadata.xml5
-rw-r--r--sys-libs/libservicelog/metadata.xml5
-rw-r--r--sys-libs/libstdc++-v3-bin/metadata.xml5
-rw-r--r--sys-libs/libstdc++-v3/metadata.xml5
-rw-r--r--sys-libs/libtermcap-compat/metadata.xml5
-rw-r--r--sys-libs/libunwind/metadata.xml5
-rw-r--r--sys-libs/libutempter/metadata.xml10
-rw-r--r--sys-libs/libvpd/metadata.xml5
-rw-r--r--sys-libs/libxcrypt/metadata.xml5
-rw-r--r--sys-libs/lrmi/metadata.xml5
-rw-r--r--sys-libs/lwp/metadata.xml1
-rw-r--r--sys-libs/mtdev/metadata.xml5
-rw-r--r--sys-libs/musl/metadata.xml5
-rw-r--r--sys-libs/ncurses/metadata.xml5
-rw-r--r--sys-libs/newlib/metadata.xml5
-rw-r--r--sys-libs/nss-db/metadata.xml5
-rw-r--r--sys-libs/nss_wrapper/metadata.xml5
-rw-r--r--sys-libs/ntdb/metadata.xml5
-rw-r--r--sys-libs/openipmi/metadata.xml5
-rw-r--r--sys-libs/pam/metadata.xml1
-rw-r--r--sys-libs/pwdb/metadata.xml5
-rw-r--r--sys-libs/readline/metadata.xml5
-rw-r--r--sys-libs/rvm/metadata.xml1
-rw-r--r--sys-libs/slang/metadata.xml5
-rw-r--r--sys-libs/talloc/metadata.xml5
-rw-r--r--sys-libs/tdb/metadata.xml5
-rw-r--r--sys-libs/tevent/metadata.xml5
-rw-r--r--sys-libs/timezone-data/metadata.xml5
-rw-r--r--sys-libs/uclibc/metadata.xml5
-rw-r--r--sys-libs/uid_wrapper/metadata.xml5
-rw-r--r--sys-libs/zlib/metadata.xml5
59 files changed, 228 insertions, 60 deletions
diff --git a/sys-libs/argp-standalone/metadata.xml b/sys-libs/argp-standalone/metadata.xml
index c89e3114594a..1bd2342b3d61 100644
--- a/sys-libs/argp-standalone/metadata.xml
+++ b/sys-libs/argp-standalone/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>gentoo@wildgooses.com</email>
<name>Ed Wildgoose</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/binutils-libs/metadata.xml b/sys-libs/binutils-libs/metadata.xml
index 9005ddcf7683..33dc6bb6273d 100644
--- a/sys-libs/binutils-libs/metadata.xml
+++ b/sys-libs/binutils-libs/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="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
<flag name="multitarget">Enable all possible targets in libbfd</flag>
diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
index 95143822cca7..f09fa5733d61 100644
--- a/sys-libs/cracklib/metadata.xml
+++ b/sys-libs/cracklib/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>
<upstream>
<remote-id type="sourceforge">cracklib</remote-id>
<remote-id type="github">cracklib/cracklib</remote-id>
diff --git a/sys-libs/csu/metadata.xml b/sys-libs/csu/metadata.xml
index f737f232e3bf..6bd94e0770d5 100644
--- a/sys-libs/csu/metadata.xml
+++ b/sys-libs/csu/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/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
index dabfe3f0d14a..0aea622da47c 100644
--- a/sys-libs/db/metadata.xml
+++ b/sys-libs/db/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>
<longdescription>
The Berkeley Database (Berkeley DB) is a programmatic toolkit
that provides embedded database support for both traditional and client/server
diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index d687bd7f96ce..dabbf6a8458e 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/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>
<upstream>
<remote-id type="sourceforge">e2fsprogs</remote-id>
</upstream>
diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index a95aa780763a..7d939962d867 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<use>
<flag name="nagios">
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index e58e63d6c5aa..755b19ad7f4f 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/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="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
<flag name="exporter">enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index d8e8789c6e0f..5c0827ceb8da 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/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="debug">When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)</flag>
<flag name="gd">build memusage and memusagestat tools</flag>
diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/gpm/metadata.xml
+++ b/sys-libs/gpm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/kpmcore/metadata.xml b/sys-libs/kpmcore/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sys-libs/kpmcore/metadata.xml
+++ b/sys-libs/kpmcore/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/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index 587dabd73f1d..36f98ffb31b9 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/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>samba</herd>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/lib-compat-loki/metadata.xml b/sys-libs/lib-compat-loki/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/sys-libs/lib-compat-loki/metadata.xml
+++ b/sys-libs/lib-compat-loki/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/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/lib-compat/metadata.xml
+++ b/sys-libs/lib-compat/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/sys-libs/libaal/metadata.xml b/sys-libs/libaal/metadata.xml
index 981ae413d18e..0de89ea96730 100644
--- a/sys-libs/libaal/metadata.xml
+++ b/sys-libs/libaal/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>
<longdescription>
This is a library, that provides application abstraction mechanism.
It includes device abstraction, libc independence code, etc.
diff --git a/sys-libs/libapparmor/metadata.xml b/sys-libs/libapparmor/metadata.xml
index f60a2bbf973d..0b14b7a31476 100644
--- a/sys-libs/libapparmor/metadata.xml
+++ b/sys-libs/libapparmor/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>hardened</herd>
<maintainer>
<email>kensington@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">apparmor</remote-id>
</upstream>
diff --git a/sys-libs/libavc1394/metadata.xml b/sys-libs/libavc1394/metadata.xml
index e86032584253..2c3c35a41e48 100644
--- a/sys-libs/libavc1394/metadata.xml
+++ b/sys-libs/libavc1394/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>
<upstream>
<remote-id type="sourceforge">libavc1394</remote-id>
</upstream>
diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index 036748e8916b..b24b5f1065b5 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/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>
<longdescription>
The libcap-ng library is intended to make programming with POSIX
capabilities much easier than the traditional libcap library. It includes
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/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/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index 1d3cd13e19bf..61f0fb1a7c8e 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>bsd</herd>
<!-- BSD is here because the plan is to have libc++ as the standard C++
library with clang. A llvm herd would make a lot of sense here too -->
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+ <maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+ </maintainer>
<use>
<flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
</use>
diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml
index bb8b535288ce..cdb8a11b95fd 100644
--- a/sys-libs/libcxxrt/metadata.xml
+++ b/sys-libs/libcxxrt/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>bsd</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+ <maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+ </maintainer>
<use>
<flag name="libunwind">Use <pkg>sys-libs/libunwind</pkg> instead of libgcc_s for unwinding. This should allow avoiding relying on <pkg>sys-devel/gcc</pkg> but for now clang is setup to use libgcc_s.</flag>
</use>
diff --git a/sys-libs/libfreevec/metadata.xml b/sys-libs/libfreevec/metadata.xml
index c5e4f911c5c4..65bf54cdfa38 100644
--- a/sys-libs/libfreevec/metadata.xml
+++ b/sys-libs/libfreevec/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>ppc</herd>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
index 9dcec146689b..9687d230194c 100644
--- a/sys-libs/libhugetlbfs/metadata.xml
+++ b/sys-libs/libhugetlbfs/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="perl">Install the cpupcstat tool and some perl modules</flag>
</use>
diff --git a/sys-libs/libieee1284/metadata.xml b/sys-libs/libieee1284/metadata.xml
index 648ebdad06a8..c181919828cd 100644
--- a/sys-libs/libieee1284/metadata.xml
+++ b/sys-libs/libieee1284/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>
<upstream>
<remote-id type="sourceforge">libieee1284</remote-id>
</upstream>
diff --git a/sys-libs/libkudzu/metadata.xml b/sys-libs/libkudzu/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/sys-libs/libkudzu/metadata.xml
+++ b/sys-libs/libkudzu/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>livecd</herd>
+<maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/libmath++/metadata.xml b/sys-libs/libmath++/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/sys-libs/libmath++/metadata.xml
+++ b/sys-libs/libmath++/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/sys-libs/libosinfo/metadata.xml b/sys-libs/libosinfo/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/sys-libs/libosinfo/metadata.xml
+++ b/sys-libs/libosinfo/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/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libraw1394/metadata.xml
+++ b/sys-libs/libraw1394/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/librtas/metadata.xml b/sys-libs/librtas/metadata.xml
index 749b46648ac5..61fca846f804 100644
--- a/sys-libs/librtas/metadata.xml
+++ b/sys-libs/librtas/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>ppc64</herd>
+ <maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">librtas</remote-id>
</upstream>
diff --git a/sys-libs/libservicelog/metadata.xml b/sys-libs/libservicelog/metadata.xml
index 09b995174c26..55b6e6055e09 100644
--- a/sys-libs/libservicelog/metadata.xml
+++ b/sys-libs/libservicelog/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>ppc64</herd>
+ <maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">linux-diag</remote-id>
</upstream>
diff --git a/sys-libs/libstdc++-v3-bin/metadata.xml b/sys-libs/libstdc++-v3-bin/metadata.xml
index 034c09eb248a..8278b9b25ff2 100644
--- a/sys-libs/libstdc++-v3-bin/metadata.xml
+++ b/sys-libs/libstdc++-v3-bin/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ppc</herd>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/libstdc++-v3/metadata.xml b/sys-libs/libstdc++-v3/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/sys-libs/libstdc++-v3/metadata.xml
+++ b/sys-libs/libstdc++-v3/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/sys-libs/libtermcap-compat/metadata.xml b/sys-libs/libtermcap-compat/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/libtermcap-compat/metadata.xml
+++ b/sys-libs/libtermcap-compat/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/sys-libs/libunwind/metadata.xml b/sys-libs/libunwind/metadata.xml
index 4c7b538d98c6..d64ee9740694 100644
--- a/sys-libs/libunwind/metadata.xml
+++ b/sys-libs/libunwind/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="debug-frame">Adds support for DWARF .debug_frame section: Use the information from this section if available</flag>
<flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
index 23c2cea3bcd7..609938156747 100644
--- a/sys-libs/libutempter/metadata.xml
+++ b/sys-libs/libutempter/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>x11</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/libvpd/metadata.xml b/sys-libs/libvpd/metadata.xml
index ec717b71c1e8..a4f47f13ea27 100644
--- a/sys-libs/libvpd/metadata.xml
+++ b/sys-libs/libvpd/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>ppc64</herd>
+ <maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
index 8f5a0e9c8006..113897cea76f 100644
--- a/sys-libs/libxcrypt/metadata.xml
+++ b/sys-libs/libxcrypt/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>hardened</herd>
+ <maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<longdescription>
Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for
libcrypt, which comes with the GNU C Library. It supports DES crypt,
diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
index 51e8d40c477a..d97933f8b39f 100644
--- a/sys-libs/lrmi/metadata.xml
+++ b/sys-libs/lrmi/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>
<upstream>
<remote-id type="sourceforge">lrmi</remote-id>
</upstream>
diff --git a/sys-libs/lwp/metadata.xml b/sys-libs/lwp/metadata.xml
index ca66751dee2f..097975e3adc2 100644
--- a/sys-libs/lwp/metadata.xml
+++ b/sys-libs/lwp/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>net-fs</herd>
</pkgmetadata>
diff --git a/sys-libs/mtdev/metadata.xml b/sys-libs/mtdev/metadata.xml
index 1e9847021115..2ef40f28a26c 100644
--- a/sys-libs/mtdev/metadata.xml
+++ b/sys-libs/mtdev/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>x11</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml
index 733d904a9f88..2390ab96137e 100644
--- a/sys-libs/musl/metadata.xml
+++ b/sys-libs/musl/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -9,4 +8,8 @@
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index f5459e5aa3a7..b5d4c1f8e0a5 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/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="ada">Add bindings for the ADA programming language</flag>
<flag name="tinfo">
diff --git a/sys-libs/newlib/metadata.xml b/sys-libs/newlib/metadata.xml
index c30294285aee..d75c8c9e2c47 100644
--- a/sys-libs/newlib/metadata.xml
+++ b/sys-libs/newlib/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>toolchain</herd>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer>
+<email>toolchain@gentoo.org</email>
+<name>Gentoo Toolchain Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/nss-db/metadata.xml
+++ b/sys-libs/nss-db/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/sys-libs/nss_wrapper/metadata.xml b/sys-libs/nss_wrapper/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/nss_wrapper/metadata.xml
+++ b/sys-libs/nss_wrapper/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/ntdb/metadata.xml b/sys-libs/ntdb/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/ntdb/metadata.xml
+++ b/sys-libs/ntdb/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/openipmi/metadata.xml b/sys-libs/openipmi/metadata.xml
index cc81d5a5bb71..5df442e5167a 100644
--- a/sys-libs/openipmi/metadata.xml
+++ b/sys-libs/openipmi/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">openipmi</remote-id>
</upstream>
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index f69d9e3e8118..6a14c91d0a40 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/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>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/sys-libs/pwdb/metadata.xml b/sys-libs/pwdb/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-libs/pwdb/metadata.xml
+++ b/sys-libs/pwdb/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/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index 656aedaef0ec..6c398b85460e 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/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="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
</use>
diff --git a/sys-libs/rvm/metadata.xml b/sys-libs/rvm/metadata.xml
index ca66751dee2f..097975e3adc2 100644
--- a/sys-libs/rvm/metadata.xml
+++ b/sys-libs/rvm/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>net-fs</herd>
</pkgmetadata>
diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml
index aef01fc3d591..c746f2860f8d 100644
--- a/sys-libs/slang/metadata.xml
+++ b/sys-libs/slang/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
index be0176a4cf3b..963ed440d219 100644
--- a/sys-libs/talloc/metadata.xml
+++ b/sys-libs/talloc/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+ <maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
<use>
<flag name="compat">Enable extra compatibility stuff</flag>
</use>
diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml
index eb993d35b82e..ed54732cb951 100644
--- a/sys-libs/tdb/metadata.xml
+++ b/sys-libs/tdb/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml
index e06ba379b734..79edcaf7eb4c 100644
--- a/sys-libs/tevent/metadata.xml
+++ b/sys-libs/tevent/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index 7aaccf953694..4cc6fd1a0849 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/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>toolchain</herd>
<maintainer>
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<use>
<flag name="leaps_timezone">
Install the set of "right" timezones; these timezones include leap seconds
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index df545f8f89ef..fd532e2864c1 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/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>embedded</herd>
<maintainer>
<email>vapier@gentoo.org</email>
<description>Primary Maintainer</description>
@@ -10,6 +9,10 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
<longdescription>
uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux
systems. It is much smaller than the GNU C Library, but nearly all applications supported
diff --git a/sys-libs/uid_wrapper/metadata.xml b/sys-libs/uid_wrapper/metadata.xml
index c2d9e83c908a..dcbd28056dbe 100644
--- a/sys-libs/uid_wrapper/metadata.xml
+++ b/sys-libs/uid_wrapper/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
index 8b66de8a5583..e4285b8660e3 100644
--- a/sys-libs/zlib/metadata.xml
+++ b/sys-libs/zlib/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="minizip">include the minizip library for quick and dirty zip extraction</flag>
</use>