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-block
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-block')
-rw-r--r--sys-block/aoetools/metadata.xml5
-rw-r--r--sys-block/buffer/metadata.xml5
-rw-r--r--sys-block/devio/metadata.xml5
-rw-r--r--sys-block/di/metadata.xml5
-rw-r--r--sys-block/disktype/metadata.xml5
-rw-r--r--sys-block/eject-bsd/metadata.xml5
-rw-r--r--sys-block/eject/metadata.xml5
-rw-r--r--sys-block/endpoint/metadata.xml5
-rw-r--r--sys-block/fwdl/metadata.xml5
-rw-r--r--sys-block/gpart/metadata.xml5
-rw-r--r--sys-block/gparted/metadata.xml5
-rw-r--r--sys-block/iscsitarget/metadata.xml5
-rw-r--r--sys-block/kvpm/metadata.xml5
-rw-r--r--sys-block/lio-utils/metadata.xml5
-rw-r--r--sys-block/mbuffer/metadata.xml5
-rw-r--r--sys-block/megacli/metadata.xml5
-rw-r--r--sys-block/megactl/metadata.xml5
-rw-r--r--sys-block/mtx/metadata.xml5
-rw-r--r--sys-block/nbd/metadata.xml5
-rw-r--r--sys-block/noflushd/metadata.xml5
-rw-r--r--sys-block/nwutil/metadata.xml5
-rw-r--r--sys-block/open-iscsi/metadata.xml5
-rw-r--r--sys-block/parted/metadata.xml5
-rw-r--r--sys-block/partimage/metadata.xml5
-rw-r--r--sys-block/partitionmanager/metadata.xml5
-rw-r--r--sys-block/qla-fc-firmware/metadata.xml5
-rw-r--r--sys-block/rtsadmin/metadata.xml10
-rw-r--r--sys-block/smp_utils/metadata.xml5
-rw-r--r--sys-block/tapecat/metadata.xml6
-rw-r--r--sys-block/targetcli/metadata.xml10
-rw-r--r--sys-block/tgt/metadata.xml5
-rw-r--r--sys-block/thin-provisioning-tools/metadata.xml5
-rw-r--r--sys-block/vblade/metadata.xml5
-rw-r--r--sys-block/whdd/metadata.xml5
34 files changed, 144 insertions, 37 deletions
diff --git a/sys-block/aoetools/metadata.xml b/sys-block/aoetools/metadata.xml
index 58108bc70edc..7f6fabc18a5a 100644
--- a/sys-block/aoetools/metadata.xml
+++ b/sys-block/aoetools/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">aoetools</remote-id>
</upstream>
diff --git a/sys-block/buffer/metadata.xml b/sys-block/buffer/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/buffer/metadata.xml
+++ b/sys-block/buffer/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-block/devio/metadata.xml b/sys-block/devio/metadata.xml
index b147a1c47f71..4d28393b457f 100644
--- a/sys-block/devio/metadata.xml
+++ b/sys-block/devio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>embedded</herd>
+ <maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">devio</remote-id>
</upstream>
diff --git a/sys-block/di/metadata.xml b/sys-block/di/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/di/metadata.xml
+++ b/sys-block/di/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-block/disktype/metadata.xml b/sys-block/disktype/metadata.xml
index f27b7d146f9d..06aa2685c371 100644
--- a/sys-block/disktype/metadata.xml
+++ b/sys-block/disktype/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>forensics</herd>
+ <maintainer>
+ <email>forensics@gentoo.org</email>
+ <name>Gentoo Forensics Project</name>
+ </maintainer>
<longdescription>
The purpose of disktype is to detect the content format of a disk or disk image. It knows about common file systems,
partition tables, and boot codes.
diff --git a/sys-block/eject-bsd/metadata.xml b/sys-block/eject-bsd/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/sys-block/eject-bsd/metadata.xml
+++ b/sys-block/eject-bsd/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-block/eject/metadata.xml b/sys-block/eject/metadata.xml
index 4025f1e9873a..4c1126c7a285 100644
--- a/sys-block/eject/metadata.xml
+++ b/sys-block/eject/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">eject</remote-id>
</upstream>
diff --git a/sys-block/endpoint/metadata.xml b/sys-block/endpoint/metadata.xml
index 6cce6056708c..729b5868319b 100644
--- a/sys-block/endpoint/metadata.xml
+++ b/sys-block/endpoint/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">
Endpoint turns a Linux machine with one or more firewire cards into an SBP-2
device. The advantage is that you can use any file or device the linux
diff --git a/sys-block/fwdl/metadata.xml b/sys-block/fwdl/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/fwdl/metadata.xml
+++ b/sys-block/fwdl/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-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/gpart/metadata.xml
+++ b/sys-block/gpart/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-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index e06bfd6639f4..71b3e40b76dc 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/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>gnome</herd>
<maintainer>
<email>eva@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
copy various filesystems.
diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml
index 21701595e2c8..30e6e49238e4 100644
--- a/sys-block/iscsitarget/metadata.xml
+++ b/sys-block/iscsitarget/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>ryao@gentoo.org</email>
<description>Primary maintainer</description>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">iscsitarget</remote-id>
</upstream>
diff --git a/sys-block/kvpm/metadata.xml b/sys-block/kvpm/metadata.xml
index deeb517dba44..3cc6f16d972e 100644
--- a/sys-block/kvpm/metadata.xml
+++ b/sys-block/kvpm/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="sourceforge">kvpm</remote-id>
</upstream>
diff --git a/sys-block/lio-utils/metadata.xml b/sys-block/lio-utils/metadata.xml
index ed404319e336..89a312bfd0ee 100644
--- a/sys-block/lio-utils/metadata.xml
+++ b/sys-block/lio-utils/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>
<longdescription>
Tools for controlling target_core_mod/ConfigFS
</longdescription>
diff --git a/sys-block/mbuffer/metadata.xml b/sys-block/mbuffer/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/mbuffer/metadata.xml
+++ b/sys-block/mbuffer/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-block/megacli/metadata.xml b/sys-block/megacli/metadata.xml
index 62d09cfb13cf..77921ba5ea20 100644
--- a/sys-block/megacli/metadata.xml
+++ b/sys-block/megacli/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- used by infra, please do not non-maintainer drop -->
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-block/megactl/metadata.xml b/sys-block/megactl/metadata.xml
index 3591081b02d5..f8e4ad1df5ca 100644
--- a/sys-block/megactl/metadata.xml
+++ b/sys-block/megactl/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- used by infra, please do not non-maintainer drop -->
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription>
This project is a small collection of programs for examining configuration and
status of LSI megaraid adapters, especially Dell PERC RAID adapters, and
diff --git a/sys-block/mtx/metadata.xml b/sys-block/mtx/metadata.xml
index 982d2043d014..a4f7f5ce1b0d 100644
--- a/sys-block/mtx/metadata.xml
+++ b/sys-block/mtx/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">mtx</remote-id>
</upstream>
diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index 3c1ceb90a4ab..7213db31f2a1 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/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">nbd</remote-id>
</upstream>
diff --git a/sys-block/noflushd/metadata.xml b/sys-block/noflushd/metadata.xml
index 2cca6b170227..5482cc48bc12 100644
--- a/sys-block/noflushd/metadata.xml
+++ b/sys-block/noflushd/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">noflushd</remote-id>
</upstream>
diff --git a/sys-block/nwutil/metadata.xml b/sys-block/nwutil/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/sys-block/nwutil/metadata.xml
+++ b/sys-block/nwutil/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-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/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-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 54903f1e1aa0..57a200909c3e 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/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="device-mapper">
Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml
index 330915a57d4d..d692971444e0 100644
--- a/sys-block/partimage/metadata.xml
+++ b/sys-block/partimage/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="nologin">Do not include login support when connecting partimaged</flag>
</use>
diff --git a/sys-block/partitionmanager/metadata.xml b/sys-block/partitionmanager/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sys-block/partitionmanager/metadata.xml
+++ b/sys-block/partitionmanager/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-block/qla-fc-firmware/metadata.xml b/sys-block/qla-fc-firmware/metadata.xml
index 28df89f0eb13..85c537cb0c96 100644
--- a/sys-block/qla-fc-firmware/metadata.xml
+++ b/sys-block/qla-fc-firmware/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>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription lang="en">
QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards.
This package contains snapshots of firmware releases from the QLogic FTP server.
diff --git a/sys-block/rtsadmin/metadata.xml b/sys-block/rtsadmin/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/sys-block/rtsadmin/metadata.xml
+++ b/sys-block/rtsadmin/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
<maintainer>
<email>alexxy@gentoo.org</email>
<name>Alexey Shvetsov</name>
</maintainer>
+<maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-block/smp_utils/metadata.xml b/sys-block/smp_utils/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/sys-block/smp_utils/metadata.xml
+++ b/sys-block/smp_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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-block/tapecat/metadata.xml b/sys-block/tapecat/metadata.xml
index a1bcb6b31d1d..082c7ae4c6b9 100644
--- a/sys-block/tapecat/metadata.xml
+++ b/sys-block/tapecat/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>app-backup</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-block/targetcli/metadata.xml b/sys-block/targetcli/metadata.xml
index 59fc80b97cfa..58e68f2a310e 100644
--- a/sys-block/targetcli/metadata.xml
+++ b/sys-block/targetcli/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
<maintainer>
<email>alexxy@gentoo.org</email>
<name>Alexey Shvetsov</name>
</maintainer>
+<maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-block/tgt/metadata.xml b/sys-block/tgt/metadata.xml
index d6e2f863b2c1..49ad26b7ff5e 100644
--- a/sys-block/tgt/metadata.xml
+++ b/sys-block/tgt/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>cluster</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
<longdescription>
iSCSI Target daemon with rdma support
</longdescription>
diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index 80a86e792f04..b9d85cfb6f67 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/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>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription lang="en">
A suite of tools for thin provisioning on Linux.
</longdescription>
diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
index 58108bc70edc..7f6fabc18a5a 100644
--- a/sys-block/vblade/metadata.xml
+++ b/sys-block/vblade/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">aoetools</remote-id>
</upstream>
diff --git a/sys-block/whdd/metadata.xml b/sys-block/whdd/metadata.xml
index 514413068c26..309ffd594d7d 100644
--- a/sys-block/whdd/metadata.xml
+++ b/sys-block/whdd/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>andrey.krieger.utkin@gmail.com</email>
<name>Andrey Utkin</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>
<upstream>
<remote-id type="github">krieger-od/whdd</remote-id>
</upstream>