summaryrefslogtreecommitdiff
path: root/sys-fs
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-fs
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-fs')
-rw-r--r--sys-fs/arm-fdisk/metadata.xml5
-rw-r--r--sys-fs/autorun/metadata.xml5
-rw-r--r--sys-fs/avfs/metadata.xml6
-rw-r--r--sys-fs/cramfs/metadata.xml5
-rw-r--r--sys-fs/cryptsetup/metadata.xml5
-rw-r--r--sys-fs/dd-rescue/metadata.xml5
-rw-r--r--sys-fs/devfsd/metadata.xml5
-rw-r--r--sys-fs/diskdev_cmds/metadata.xml5
-rw-r--r--sys-fs/dmg2img/metadata.xml5
-rw-r--r--sys-fs/dosfstools/metadata.xml5
-rw-r--r--sys-fs/e2fsprogs/metadata.xml5
-rw-r--r--sys-fs/e2tools/metadata.xml5
-rw-r--r--sys-fs/ecryptfs-utils/metadata.xml6
-rw-r--r--sys-fs/exfat-utils/metadata.xml5
-rw-r--r--sys-fs/ext4magic/metadata.xml5
-rw-r--r--sys-fs/extundelete/metadata.xml5
-rw-r--r--sys-fs/fur/metadata.xml1
-rw-r--r--sys-fs/fuse-exfat/metadata.xml5
-rw-r--r--sys-fs/fuse/metadata.xml1
-rw-r--r--sys-fs/fuse4bsd/metadata.xml5
-rw-r--r--sys-fs/fuseiso/metadata.xml5
-rw-r--r--sys-fs/genext2fs/metadata.xml5
-rw-r--r--sys-fs/gfs2-utils/metadata.xml5
-rw-r--r--sys-fs/hfsplusutils/metadata.xml5
-rw-r--r--sys-fs/hfsutils/metadata.xml5
-rw-r--r--sys-fs/iprutils/metadata.xml5
-rw-r--r--sys-fs/jdiskreport-bin/metadata.xml5
-rw-r--r--sys-fs/lde/metadata.xml5
-rw-r--r--sys-fs/loop-aes/metadata.xml5
-rw-r--r--sys-fs/lsscsi/metadata.xml5
-rw-r--r--sys-fs/lufis/metadata.xml1
-rw-r--r--sys-fs/lufs/metadata.xml5
-rw-r--r--sys-fs/mac-fdisk/metadata.xml5
-rw-r--r--sys-fs/mdadm/metadata.xml5
-rw-r--r--sys-fs/mtd-utils/metadata.xml5
-rw-r--r--sys-fs/mtools/metadata.xml5
-rw-r--r--sys-fs/multipath-tools/metadata.xml5
-rw-r--r--sys-fs/ntfs3g/metadata.xml5
-rw-r--r--sys-fs/ocfs2-tools/metadata.xml5
-rw-r--r--sys-fs/progsreiserfs/metadata.xml5
-rw-r--r--sys-fs/quota/metadata.xml5
-rw-r--r--sys-fs/quotatool/metadata.xml5
-rw-r--r--sys-fs/reiser4progs/metadata.xml5
-rw-r--r--sys-fs/reiserfsprogs/metadata.xml5
-rw-r--r--sys-fs/scan-ffs/metadata.xml5
-rw-r--r--sys-fs/siefs/metadata.xml1
-rw-r--r--sys-fs/squashfs-tools/metadata.xml5
-rw-r--r--sys-fs/sshfs-fuse/metadata.xml1
-rw-r--r--sys-fs/static-dev/metadata.xml5
-rw-r--r--sys-fs/sysfsutils/metadata.xml5
-rw-r--r--sys-fs/traydevice/metadata.xml5
-rw-r--r--sys-fs/udftools/metadata.xml5
-rw-r--r--sys-fs/udiskie/metadata.xml5
-rw-r--r--sys-fs/udisks/metadata.xml1
-rw-r--r--sys-fs/ufsutils/metadata.xml5
-rw-r--r--sys-fs/wpflash/metadata.xml5
-rw-r--r--sys-fs/xfsdump/metadata.xml5
-rw-r--r--sys-fs/xfsprogs/metadata.xml5
-rw-r--r--sys-fs/yaffs-utils/metadata.xml5
-rw-r--r--sys-fs/yaffs2-utils/metadata.xml5
-rw-r--r--sys-fs/yaffs2utils/metadata.xml5
61 files changed, 220 insertions, 63 deletions
diff --git a/sys-fs/arm-fdisk/metadata.xml b/sys-fs/arm-fdisk/metadata.xml
index 5454528f209..fe573c6bd8a 100644
--- a/sys-fs/arm-fdisk/metadata.xml
+++ b/sys-fs/arm-fdisk/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>arm</herd>
+<maintainer>
+ <email>arm@gentoo.org</email>
+ <name>Gentoo Linux ARM Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/autorun/metadata.xml b/sys-fs/autorun/metadata.xml
index 8bcffd6d6a8..76157a6c50c 100644
--- a/sys-fs/autorun/metadata.xml
+++ b/sys-fs/autorun/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">autorun</remote-id>
</upstream>
diff --git a/sys-fs/avfs/metadata.xml b/sys-fs/avfs/metadata.xml
index 26d3015a0b2..27b688c32ce 100644
--- a/sys-fs/avfs/metadata.xml
+++ b/sys-fs/avfs/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kernel-misc</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>pete4abw@comcast.net</email>
<name>Peter Hyman</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">avf</remote-id>
</upstream>
diff --git a/sys-fs/cramfs/metadata.xml b/sys-fs/cramfs/metadata.xml
index b63efc3d3b7..41583e0b46a 100644
--- a/sys-fs/cramfs/metadata.xml
+++ b/sys-fs/cramfs/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">cramfs</remote-id>
</upstream>
diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 1dbe202d27f..59cc82bdcfc 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/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="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/dd-rescue/metadata.xml
+++ b/sys-fs/dd-rescue/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-fs/devfsd/metadata.xml b/sys-fs/devfsd/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/devfsd/metadata.xml
+++ b/sys-fs/devfsd/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-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 13d6b39cda1..7d9e5802812 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/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>ppc</herd>
<maintainer>
<email>josejx@gentoo.org</email>
<name>Joseph Jezak</name>
</maintainer>
+<maintainer>
+<email>ppc@gentoo.org</email>
+<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
<longdescription lang="en">
HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
versions.
diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml
index 18b079652c0..8d19af5dfd7 100644
--- a/sys-fs/dmg2img/metadata.xml
+++ b/sys-fs/dmg2img/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>base-system</herd>
<maintainer>
<email>josejx@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription lang="en">
dmg2img is an application that can convert .dmg files, popular on Mac OSX
systems, to HFS+ disk images, suitable for mounting on Linux systems.
diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index 232be8c7639..8c281cb0e55 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/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="github">dosfstools/dosfstools</remote-id>
</upstream>
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 3f0c2e10059..064648ea37e 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/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="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
<remote-id type="sourceforge">e2fsprogs</remote-id>
diff --git a/sys-fs/e2tools/metadata.xml b/sys-fs/e2tools/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/e2tools/metadata.xml
+++ b/sys-fs/e2tools/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-fs/ecryptfs-utils/metadata.xml b/sys-fs/ecryptfs-utils/metadata.xml
index 8a71e7a160e..1047fe2fdf7 100644
--- a/sys-fs/ecryptfs-utils/metadata.xml
+++ b/sys-fs/ecryptfs-utils/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kernel-misc</herd>
- <herd>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> key module</flag>
<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> key
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index f64d26db4a6..67d30617dcf 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/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>base-system</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
</maintainer>
<maintainer>
<email>floppym@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="google-code">exfat</remote-id>
<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 3ae36b5a418..fd3a36e345e 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/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>gokturk@binghamton.edu</email>
<name>Gokturk 'gokturk' Yuksek</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="expert-mode">Builds ext4magic with expert mode. Highly useful in recovering data from a corrupted filesystem</flag>
<flag name="file-attr">Enable the recovery of file attributes (append, immutable, nodump etc)</flag>
diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
index 4e12c0483bb..1c8d47682a3 100644
--- a/sys-fs/extundelete/metadata.xml
+++ b/sys-fs/extundelete/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>base-system</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">extundelete</remote-id>
</upstream>
diff --git a/sys-fs/fur/metadata.xml b/sys-fs/fur/metadata.xml
index b7fb13fcc09..942d1d0bc95 100644
--- a/sys-fs/fur/metadata.xml
+++ b/sys-fs/fur/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="void-chmod">Enable fake hook for "chmod" that will only return 0</flag>
</use>
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index f64d26db4a6..67d30617dcf 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/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>base-system</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
</maintainer>
<maintainer>
<email>floppym@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="google-code">exfat</remote-id>
<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index 1d274435d91..a5d07b12ab6 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/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>kernel-misc</herd>
<maintainer>
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
diff --git a/sys-fs/fuse4bsd/metadata.xml b/sys-fs/fuse4bsd/metadata.xml
index ecedda4aa2c..d7caf7d3b1d 100644
--- a/sys-fs/fuse4bsd/metadata.xml
+++ b/sys-fs/fuse4bsd/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/sys-fs/fuseiso/metadata.xml b/sys-fs/fuseiso/metadata.xml
index 9e127fd0643..b6e4f90f094 100644
--- a/sys-fs/fuseiso/metadata.xml
+++ b/sys-fs/fuseiso/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>zhaoxiaoqiang007@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fuseiso</remote-id>
</upstream>
diff --git a/sys-fs/genext2fs/metadata.xml b/sys-fs/genext2fs/metadata.xml
index 039dac4acd3..a55c404d1fc 100644
--- a/sys-fs/genext2fs/metadata.xml
+++ b/sys-fs/genext2fs/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>dev-embedded</herd>
+ <maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">genext2fs</remote-id>
</upstream>
diff --git a/sys-fs/gfs2-utils/metadata.xml b/sys-fs/gfs2-utils/metadata.xml
index 71656942007..8a2a13a9b76 100644
--- a/sys-fs/gfs2-utils/metadata.xml
+++ b/sys-fs/gfs2-utils/metadata.xml
@@ -1,6 +1,9 @@
<?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>
<longdescription>GFS2 Utilities</longdescription>
</pkgmetadata>
diff --git a/sys-fs/hfsplusutils/metadata.xml b/sys-fs/hfsplusutils/metadata.xml
index 034c09eb248..8278b9b25ff 100644
--- a/sys-fs/hfsplusutils/metadata.xml
+++ b/sys-fs/hfsplusutils/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-fs/hfsutils/metadata.xml b/sys-fs/hfsutils/metadata.xml
index 034c09eb248..8278b9b25ff 100644
--- a/sys-fs/hfsutils/metadata.xml
+++ b/sys-fs/hfsutils/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-fs/iprutils/metadata.xml b/sys-fs/iprutils/metadata.xml
index fc39b732815..29a92f5c014 100644
--- a/sys-fs/iprutils/metadata.xml
+++ b/sys-fs/iprutils/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">iprdd</remote-id>
</upstream>
diff --git a/sys-fs/jdiskreport-bin/metadata.xml b/sys-fs/jdiskreport-bin/metadata.xml
index 9df3e92f25a..4a85d8a209f 100644
--- a/sys-fs/jdiskreport-bin/metadata.xml
+++ b/sys-fs/jdiskreport-bin/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>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription lang="en">
JDiskReport enables you to understand how much space the files and
directories consume on your disk drives, and it helps you find obsolete
diff --git a/sys-fs/lde/metadata.xml b/sys-fs/lde/metadata.xml
index 5c165c26dfe..e00243210f5 100644
--- a/sys-fs/lde/metadata.xml
+++ b/sys-fs/lde/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">lde</remote-id>
</upstream>
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 94c55ab280b..cd635aaa8d0 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/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="extra-ciphers">Enable extra ciphers</flag>
<flag name="keyscrub">Protects the encryption key in memory but takes
diff --git a/sys-fs/lsscsi/metadata.xml b/sys-fs/lsscsi/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/lsscsi/metadata.xml
+++ b/sys-fs/lsscsi/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-fs/lufis/metadata.xml b/sys-fs/lufis/metadata.xml
index e93f1bcba44..3cde2c779d3 100644
--- a/sys-fs/lufis/metadata.xml
+++ b/sys-fs/lufis/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>kernel-misc</herd>
<upstream>
<remote-id type="sourceforge">fuse</remote-id>
</upstream>
diff --git a/sys-fs/lufs/metadata.xml b/sys-fs/lufs/metadata.xml
index e5e3de083f3..882ef8994c6 100644
--- a/sys-fs/lufs/metadata.xml
+++ b/sys-fs/lufs/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">lufs</remote-id>
</upstream>
diff --git a/sys-fs/mac-fdisk/metadata.xml b/sys-fs/mac-fdisk/metadata.xml
index 034c09eb248..8278b9b25ff 100644
--- a/sys-fs/mac-fdisk/metadata.xml
+++ b/sys-fs/mac-fdisk/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-fs/mdadm/metadata.xml b/sys-fs/mdadm/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/mdadm/metadata.xml
+++ b/sys-fs/mdadm/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-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index d79031dd6db..b3ec3b5c1c2 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/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>embedded</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/mtools/metadata.xml
+++ b/sys-fs/mtools/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-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 439306dc586..e9bc66b9e61 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/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>base-system</herd>
<maintainer>
<email>chutzpah@gentoo.org</email>
</maintainer>
<maintainer>
<email>ssuominen@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription lang="en">
The ntfs-3g driver is an open source, GPL licensed, third generation Linux
NTFS driver for 32-bit, little-endian architectures which was implemented
diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
index 9260f8b3146..a8e205d5422 100644
--- a/sys-fs/ocfs2-tools/metadata.xml
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+</maintainer>
<use>
<flag name="external">Enable external locking</flag>
</use>
diff --git a/sys-fs/progsreiserfs/metadata.xml b/sys-fs/progsreiserfs/metadata.xml
index 24a11a76a06..5a2efc57f90 100644
--- a/sys-fs/progsreiserfs/metadata.xml
+++ b/sys-fs/progsreiserfs/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<description>Maintainer as part of base-system work. Assign bugs to base-system.</description>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/quota/metadata.xml b/sys-fs/quota/metadata.xml
index c9834efbc84..f604bc81d21 100644
--- a/sys-fs/quota/metadata.xml
+++ b/sys-fs/quota/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="netlink">Compile daemon receiving quota messages via netlink</flag>
<flag name="rpc">Enable quota interaction via RPC</flag>
diff --git a/sys-fs/quotatool/metadata.xml b/sys-fs/quotatool/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/quotatool/metadata.xml
+++ b/sys-fs/quotatool/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-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
index 83d74e13cad..75b8317687b 100644
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/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 lang="en">
This is a library for reiser4 filesystem access and manipulation.
</longdescription>
diff --git a/sys-fs/reiserfsprogs/metadata.xml b/sys-fs/reiserfsprogs/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/reiserfsprogs/metadata.xml
+++ b/sys-fs/reiserfsprogs/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-fs/scan-ffs/metadata.xml b/sys-fs/scan-ffs/metadata.xml
index 9c79e985dd9..aa2065bf355 100644
--- a/sys-fs/scan-ffs/metadata.xml
+++ b/sys-fs/scan-ffs/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>
scan_ffs(8) recovers accidential lost or deleted disklabels.
diff --git a/sys-fs/siefs/metadata.xml b/sys-fs/siefs/metadata.xml
index f7740ac73b8..097975e3adc 100644
--- a/sys-fs/siefs/metadata.xml
+++ b/sys-fs/siefs/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/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 5613e68b358..410ebade8c3 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>livecd</herd>
+ <maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+ </maintainer>
<use>
<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
diff --git a/sys-fs/sshfs-fuse/metadata.xml b/sys-fs/sshfs-fuse/metadata.xml
index d91bea8bceb..5d45e471568 100644
--- a/sys-fs/sshfs-fuse/metadata.xml
+++ b/sys-fs/sshfs-fuse/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>kernel-misc</herd>
<maintainer>
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
diff --git a/sys-fs/static-dev/metadata.xml b/sys-fs/static-dev/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/static-dev/metadata.xml
+++ b/sys-fs/static-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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/sysfsutils/metadata.xml b/sys-fs/sysfsutils/metadata.xml
index 0777cf37585..0cc112f6813 100644
--- a/sys-fs/sysfsutils/metadata.xml
+++ b/sys-fs/sysfsutils/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>base-system</herd>
<maintainer>
<email>gregkh@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">linux-diag</remote-id>
</upstream>
diff --git a/sys-fs/traydevice/metadata.xml b/sys-fs/traydevice/metadata.xml
index 540f810e069..b8393889336 100644
--- a/sys-fs/traydevice/metadata.xml
+++ b/sys-fs/traydevice/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
index 16604bf5eea..fcf64559baa 100644
--- a/sys-fs/udftools/metadata.xml
+++ b/sys-fs/udftools/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">linux-udf</remote-id>
</upstream>
diff --git a/sys-fs/udiskie/metadata.xml b/sys-fs/udiskie/metadata.xml
index 41657ce3215..31257a8b614 100644
--- a/sys-fs/udiskie/metadata.xml
+++ b/sys-fs/udiskie/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">udiskie</remote-id>
<remote-id type="github">coldfix/udiskie</remote-id>
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 87de231a876..c859ac41762 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/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/sys-fs/ufsutils/metadata.xml b/sys-fs/ufsutils/metadata.xml
index ecedda4aa2c..d7caf7d3b1d 100644
--- a/sys-fs/ufsutils/metadata.xml
+++ b/sys-fs/ufsutils/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/sys-fs/wpflash/metadata.xml b/sys-fs/wpflash/metadata.xml
index 5454528f209..fe573c6bd8a 100644
--- a/sys-fs/wpflash/metadata.xml
+++ b/sys-fs/wpflash/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>arm</herd>
+<maintainer>
+ <email>arm@gentoo.org</email>
+ <name>Gentoo Linux ARM Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/xfsdump/metadata.xml
+++ b/sys-fs/xfsdump/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-fs/yaffs-utils/metadata.xml b/sys-fs/yaffs-utils/metadata.xml
index 5c40e771595..5fd50e81f42 100644
--- a/sys-fs/yaffs-utils/metadata.xml
+++ b/sys-fs/yaffs-utils/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/sys-fs/yaffs2-utils/metadata.xml b/sys-fs/yaffs2-utils/metadata.xml
index 5c40e771595..5fd50e81f42 100644
--- a/sys-fs/yaffs2-utils/metadata.xml
+++ b/sys-fs/yaffs2-utils/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/sys-fs/yaffs2utils/metadata.xml b/sys-fs/yaffs2utils/metadata.xml
index 5c40e771595..5fd50e81f42 100644
--- a/sys-fs/yaffs2utils/metadata.xml
+++ b/sys-fs/yaffs2utils/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>