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-apps
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-apps')
-rw-r--r--sys-apps/accountsservice/metadata.xml5
-rw-r--r--sys-apps/acl/metadata.xml5
-rw-r--r--sys-apps/adjtime/metadata.xml5
-rw-r--r--sys-apps/aix-miscutils/metadata.xml5
-rw-r--r--sys-apps/apparmor-utils/metadata.xml5
-rw-r--r--sys-apps/apparmor/metadata.xml5
-rw-r--r--sys-apps/arrayprobe/metadata.xml5
-rw-r--r--sys-apps/attr/metadata.xml5
-rw-r--r--sys-apps/baobab/metadata.xml5
-rw-r--r--sys-apps/bar/metadata.xml5
-rw-r--r--sys-apps/baselayout-java/metadata.xml5
-rw-r--r--sys-apps/baselayout/metadata.xml5
-rw-r--r--sys-apps/biosdisk/metadata.xml5
-rw-r--r--sys-apps/busybox/metadata.xml5
-rw-r--r--sys-apps/byld/metadata.xml5
-rw-r--r--sys-apps/cciss_vol_status/metadata.xml5
-rw-r--r--sys-apps/collectl/metadata.xml5
-rw-r--r--sys-apps/coreutils/metadata.xml5
-rw-r--r--sys-apps/cpint/metadata.xml5
-rw-r--r--sys-apps/cracklib-words/metadata.xml5
-rw-r--r--sys-apps/darwin-miscutils/metadata.xml5
-rw-r--r--sys-apps/dbus/metadata.xml1
-rw-r--r--sys-apps/dcfldd/metadata.xml5
-rw-r--r--sys-apps/debianutils/metadata.xml5
-rw-r--r--sys-apps/diffutils/metadata.xml5
-rw-r--r--sys-apps/dmapi/metadata.xml5
-rw-r--r--sys-apps/dmidecode/metadata.xml5
-rw-r--r--sys-apps/dmtcp/metadata.xml1
-rw-r--r--sys-apps/dnotify/metadata.xml5
-rw-r--r--sys-apps/dog/metadata.xml5
-rw-r--r--sys-apps/dtc/metadata.xml5
-rw-r--r--sys-apps/ed/metadata.xml5
-rw-r--r--sys-apps/elfix/metadata.xml5
-rw-r--r--sys-apps/ethtool/metadata.xml5
-rw-r--r--sys-apps/fakechroot/metadata.xml5
-rw-r--r--sys-apps/fakeroot-ng/metadata.xml5
-rw-r--r--sys-apps/fakeroot/metadata.xml5
-rw-r--r--sys-apps/fbset/metadata.xml5
-rw-r--r--sys-apps/file/metadata.xml5
-rw-r--r--sys-apps/findutils/metadata.xml5
-rw-r--r--sys-apps/flashrom/metadata.xml5
-rw-r--r--sys-apps/flock/metadata.xml5
-rw-r--r--sys-apps/fwcrv/metadata.xml5
-rw-r--r--sys-apps/gawk/metadata.xml5
-rw-r--r--sys-apps/gentoo-functions/metadata.xml5
-rw-r--r--sys-apps/gnome-disk-utility/metadata.xml5
-rw-r--r--sys-apps/gradm/metadata.xml5
-rw-r--r--sys-apps/grep/metadata.xml5
-rw-r--r--sys-apps/groff/metadata.xml5
-rw-r--r--sys-apps/gscanbus/metadata.xml5
-rw-r--r--sys-apps/gsmartcontrol/metadata.xml5
-rw-r--r--sys-apps/haveged/metadata.xml5
-rw-r--r--sys-apps/hbaapi/metadata.xml5
-rw-r--r--sys-apps/hdparm/metadata.xml5
-rw-r--r--sys-apps/help2man/metadata.xml5
-rw-r--r--sys-apps/hprofile/metadata.xml5
-rw-r--r--sys-apps/hwdata-gentoo/metadata.xml5
-rw-r--r--sys-apps/hwids/metadata.xml5
-rw-r--r--sys-apps/hwloc/metadata.xml5
-rw-r--r--sys-apps/hwsetup/metadata.xml5
-rw-r--r--sys-apps/ibm-powerpc-utils-papr/metadata.xml5
-rw-r--r--sys-apps/ibm-powerpc-utils/metadata.xml5
-rw-r--r--sys-apps/ifd-gempc/metadata.xml5
-rw-r--r--sys-apps/ifplugd/metadata.xml5
-rw-r--r--sys-apps/install-xattr/metadata.xml5
-rw-r--r--sys-apps/intel-performance-counter-monitor/metadata.xml5
-rw-r--r--sys-apps/ipmitool/metadata.xml5
-rw-r--r--sys-apps/ipmiutil/metadata.xml5
-rw-r--r--sys-apps/iproute2/metadata.xml5
-rw-r--r--sys-apps/irqbalance/metadata.xml5
-rw-r--r--sys-apps/isapnptools/metadata.xml5
-rw-r--r--sys-apps/iucode_tool/metadata.xml5
-rw-r--r--sys-apps/kbd/metadata.xml5
-rw-r--r--sys-apps/kexec-tools/metadata.xml5
-rw-r--r--sys-apps/keyutils/metadata.xml5
-rw-r--r--sys-apps/kmod/metadata.xml5
-rw-r--r--sys-apps/lcdsplash/metadata.xml5
-rw-r--r--sys-apps/lcdtest/metadata.xml10
-rw-r--r--sys-apps/lcdutils/metadata.xml1
-rw-r--r--sys-apps/less/metadata.xml5
-rw-r--r--sys-apps/likwid/metadata.xml5
-rw-r--r--sys-apps/lkcdutils/metadata.xml1
-rw-r--r--sys-apps/logwatch/metadata.xml5
-rw-r--r--sys-apps/lomoco/metadata.xml5
-rw-r--r--sys-apps/lsadb/metadata.xml5
-rw-r--r--sys-apps/lshw/metadata.xml5
-rw-r--r--sys-apps/lssbus/metadata.xml1
-rw-r--r--sys-apps/makedev/metadata.xml5
-rw-r--r--sys-apps/man-db/metadata.xml5
-rw-r--r--sys-apps/man-pages-posix/metadata.xml5
-rw-r--r--sys-apps/man-pages/metadata.xml5
-rw-r--r--sys-apps/man/metadata.xml5
-rw-r--r--sys-apps/mawk/metadata.xml5
-rw-r--r--sys-apps/memtest86+/metadata.xml5
-rw-r--r--sys-apps/memtest86/metadata.xml5
-rw-r--r--sys-apps/memtester/metadata.xml5
-rw-r--r--sys-apps/microcode-ctl/metadata.xml5
-rw-r--r--sys-apps/microcode-data/metadata.xml5
-rw-r--r--sys-apps/minised/metadata.xml10
-rw-r--r--sys-apps/miscfiles/metadata.xml5
-rw-r--r--sys-apps/mlocate/metadata.xml5
-rw-r--r--sys-apps/modutils/metadata.xml5
-rw-r--r--sys-apps/most/metadata.xml5
-rw-r--r--sys-apps/mount-gtk/metadata.xml5
-rw-r--r--sys-apps/mouseemu/metadata.xml5
-rw-r--r--sys-apps/mtree/metadata.xml5
-rw-r--r--sys-apps/nawk/metadata.xml5
-rw-r--r--sys-apps/net-tools/metadata.xml5
-rw-r--r--sys-apps/netboot-base/metadata.xml5
-rw-r--r--sys-apps/netkit-base/metadata.xml5
-rw-r--r--sys-apps/netloc/metadata.xml5
-rw-r--r--sys-apps/openrc/metadata.xml5
-rw-r--r--sys-apps/paxctl/metadata.xml5
-rw-r--r--sys-apps/paxctld/metadata.xml5
-rw-r--r--sys-apps/pciutils/metadata.xml5
-rw-r--r--sys-apps/pcsc-lite/metadata.xml5
-rw-r--r--sys-apps/pcsc-slb-rf72-drv/metadata.xml5
-rw-r--r--sys-apps/pcsc-tools/metadata.xml5
-rw-r--r--sys-apps/pmount-gui/metadata.xml5
-rw-r--r--sys-apps/powerpc-utils/metadata.xml5
-rw-r--r--sys-apps/prctl/metadata.xml5
-rw-r--r--sys-apps/prefix-chain-utils/metadata.xml5
-rw-r--r--sys-apps/qcontrol/metadata.xml10
-rw-r--r--sys-apps/qdiskusage/metadata.xml5
-rw-r--r--sys-apps/qingy/metadata.xml5
-rw-r--r--sys-apps/readahead-list/metadata.xml5
-rw-r--r--sys-apps/rename/metadata.xml5
-rw-r--r--sys-apps/rescan-scsi-bus/metadata.xml5
-rw-r--r--sys-apps/rng-tools/metadata.xml10
-rw-r--r--sys-apps/roccat-tools/metadata.xml5
-rw-r--r--sys-apps/rsbac-admin/metadata.xml5
-rw-r--r--sys-apps/s390-tools/metadata.xml1
-rw-r--r--sys-apps/salinfo/metadata.xml5
-rw-r--r--sys-apps/sdparm/metadata.xml5
-rw-r--r--sys-apps/sed/metadata.xml5
-rw-r--r--sys-apps/servicelog/metadata.xml5
-rw-r--r--sys-apps/setserial/metadata.xml5
-rw-r--r--sys-apps/sg3_utils/metadata.xml5
-rw-r--r--sys-apps/shadow/metadata.xml9
-rw-r--r--sys-apps/smartmontools/metadata.xml5
-rw-r--r--sys-apps/sparc-utils/metadata.xml1
-rw-r--r--sys-apps/syscriptor/metadata.xml5
-rw-r--r--sys-apps/sysvinit/metadata.xml5
-rw-r--r--sys-apps/tcp-wrappers/metadata.xml5
-rw-r--r--sys-apps/texinfo/metadata.xml5
-rw-r--r--sys-apps/timer_entropyd/metadata.xml5
-rw-r--r--sys-apps/tuxonice-userui/metadata.xml5
-rw-r--r--sys-apps/ucspi-proxy/metadata.xml5
-rw-r--r--sys-apps/ucspi-ssl/metadata.xml5
-rw-r--r--sys-apps/ucspi-tcp/metadata.xml5
-rw-r--r--sys-apps/ucspi-unix/metadata.xml5
-rw-r--r--sys-apps/udevil/metadata.xml5
-rw-r--r--sys-apps/uevt/metadata.xml5
-rw-r--r--sys-apps/unscd/metadata.xml5
-rw-r--r--sys-apps/usb_modeswitch/metadata.xml5
-rw-r--r--sys-apps/usbredir/metadata.xml10
-rw-r--r--sys-apps/usbutils/metadata.xml5
-rw-r--r--sys-apps/utempter/metadata.xml10
-rw-r--r--sys-apps/util-linux/metadata.xml5
-rw-r--r--sys-apps/vbetool/metadata.xml5
-rw-r--r--sys-apps/watchdog/metadata.xml5
-rw-r--r--sys-apps/which/metadata.xml5
-rw-r--r--sys-apps/x86info/metadata.xml5
-rw-r--r--sys-apps/xinetd/metadata.xml5
-rw-r--r--sys-apps/xmbmon/metadata.xml5
-rw-r--r--sys-apps/zorroutils/metadata.xml5
166 files changed, 663 insertions, 173 deletions
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 863d6473f89..4bfa808e533 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 0b6d87b08f4..34160af9a83 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/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="nfs">add support for NFS acls</flag>
</use>
diff --git a/sys-apps/adjtime/metadata.xml b/sys-apps/adjtime/metadata.xml
index 316fde480cf..4d8883bfc7d 100644
--- a/sys-apps/adjtime/metadata.xml
+++ b/sys-apps/adjtime/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>ppc</herd>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
<longdescription>A perl script to adjust the tick on the Kurobox and
LinkStation hardware clock (required to keep an accurate clock).
Should work on most hardware platforms.
diff --git a/sys-apps/aix-miscutils/metadata.xml b/sys-apps/aix-miscutils/metadata.xml
index 0a2c0a13150..e0e65a3e380 100644
--- a/sys-apps/aix-miscutils/metadata.xml
+++ b/sys-apps/aix-miscutils/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>prefix</herd>
<maintainer>
<email>haubi@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml
index f60a2bbf973..0b14b7a3147 100644
--- a/sys-apps/apparmor-utils/metadata.xml
+++ b/sys-apps/apparmor-utils/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-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index f60a2bbf973..0b14b7a3147 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/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-apps/arrayprobe/metadata.xml b/sys-apps/arrayprobe/metadata.xml
index f73c417076a..c1f2849ca01 100644
--- a/sys-apps/arrayprobe/metadata.xml
+++ b/sys-apps/arrayprobe/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/sys-apps/baobab/metadata.xml
+++ b/sys-apps/baobab/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-apps/bar/metadata.xml b/sys-apps/bar/metadata.xml
index d3cb34b9ca6..d907356c301 100644
--- a/sys-apps/bar/metadata.xml
+++ b/sys-apps/bar/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">clpbar</remote-id>
</upstream>
diff --git a/sys-apps/baselayout-java/metadata.xml b/sys-apps/baselayout-java/metadata.xml
index 8335e2c1858..ab3798dea81 100644
--- a/sys-apps/baselayout-java/metadata.xml
+++ b/sys-apps/baselayout-java/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">
</longdescription>
</pkgmetadata>
diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/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-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index b61e26392d0..490f950ca52 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/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>mattsch@gmail.com</email>
<name>Matthew Schultz</name>
@@ -11,4 +10,8 @@
<email>pacho@gentoo.org</email>
<description>Proxy maintainer, CC him in bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index a781804fc2b..d62d0c1c72e 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>embedded</herd>
+<maintainer>
+<email>embedded@gentoo.org</email>
+<name>Embedded Gentoo</name>
+</maintainer>
<use>
<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
<flag name="math">Enable math support in gawk (requires libm)</flag>
diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
index 9652057d92c..cedf7bbe2ad 100644
--- a/sys-apps/byld/metadata.xml
+++ b/sys-apps/byld/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">byld</remote-id>
</upstream>
diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
index c69ecae19d8..bb08d34d20c 100644
--- a/sys-apps/cciss_vol_status/metadata.xml
+++ b/sys-apps/cciss_vol_status/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>chainsaw@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">cciss</remote-id>
</upstream>
diff --git a/sys-apps/collectl/metadata.xml b/sys-apps/collectl/metadata.xml
index bace82278d2..a2b7c24837d 100644
--- a/sys-apps/collectl/metadata.xml
+++ b/sys-apps/collectl/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">collectl</remote-id>
</upstream>
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index b9f0e009cda..544359e16d2 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/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="hostname">Build the hostname program</flag>
<flag name="kill">Build the kill program</flag>
diff --git a/sys-apps/cpint/metadata.xml b/sys-apps/cpint/metadata.xml
index 045daae69a4..f74e36708ce 100644
--- a/sys-apps/cpint/metadata.xml
+++ b/sys-apps/cpint/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>s390</herd>
+<maintainer>
+ <email>s390@gentoo.org</email>
+ <name>Gentoo Linux s390 Development</name>
+</maintainer>
<longdescription>Linux/390 Interface to z/VM's Control Program</longdescription>
</pkgmetadata>
diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 95143822cca..f09fa5733d6 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/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-apps/darwin-miscutils/metadata.xml b/sys-apps/darwin-miscutils/metadata.xml
index 4561e552bd0..4609b17cbb9 100644
--- a/sys-apps/darwin-miscutils/metadata.xml
+++ b/sys-apps/darwin-miscutils/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-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 6562398994a..644367aa064 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/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-apps/dcfldd/metadata.xml b/sys-apps/dcfldd/metadata.xml
index 961146344a8..abd8600ae73 100644
--- a/sys-apps/dcfldd/metadata.xml
+++ b/sys-apps/dcfldd/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>
<upstream>
<remote-id type="sourceforge">dcfldd</remote-id>
</upstream>
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/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-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/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-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/dmapi/metadata.xml
+++ b/sys-apps/dmapi/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-apps/dmidecode/metadata.xml b/sys-apps/dmidecode/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/dmidecode/metadata.xml
+++ b/sys-apps/dmidecode/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-apps/dmtcp/metadata.xml b/sys-apps/dmtcp/metadata.xml
index 154329b9ce8..d630cd18a69 100644
--- a/sys-apps/dmtcp/metadata.xml
+++ b/sys-apps/dmtcp/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<use>
<flag name="fast">Enable experimental performance options such as mmap allocator.</flag>
<flag name="trace">Enable ptrace support (only valid with debug enabled).</flag>
diff --git a/sys-apps/dnotify/metadata.xml b/sys-apps/dnotify/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/dnotify/metadata.xml
+++ b/sys-apps/dnotify/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-apps/dog/metadata.xml b/sys-apps/dog/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/sys-apps/dog/metadata.xml
+++ b/sys-apps/dog/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index ccba990cce6..d7bd5974c9e 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/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>ppc64</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-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/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-apps/elfix/metadata.xml b/sys-apps/elfix/metadata.xml
index 00af8020b07..84c2119c9db 100644
--- a/sys-apps/elfix/metadata.xml
+++ b/sys-apps/elfix/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>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<use>
<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 5977c7f15c1..0e85fbef168 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/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">
ethtool is a Linux utility for controlling network drivers and hardware,
particularly for wired Ethernet devices. It can be used to:
diff --git a/sys-apps/fakechroot/metadata.xml b/sys-apps/fakechroot/metadata.xml
index 4f3f7b2bd97..2ae24da6066 100644
--- a/sys-apps/fakechroot/metadata.xml
+++ b/sys-apps/fakechroot/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>anthoine.bourgeois@gmail.com</email>
<description>Maintainer, assign bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
index 0841cba5b9e..f5e2aeb8bd4 100644
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ b/sys-apps/fakeroot-ng/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>anthoine.bourgeois@gmail.com</email>
<description>Maintainer, assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fakerootng</remote-id>
</upstream>
diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/fakeroot/metadata.xml
+++ b/sys-apps/fakeroot/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-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/fbset/metadata.xml
+++ b/sys-apps/fbset/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-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index d05cbc00cc0..7e6490f473f 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/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>
<bugs-to>http://bugs.gw.com/</bugs-to>
</upstream>
diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index b51f27ac8e7..c64af58c5ca 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/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:gnu:findutils</remote-id>
</upstream>
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 6c05e6d39c0..9031ce9380f 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/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>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
@@ -10,6 +9,10 @@
<email>peter@stuge.se</email>
<description>Please CC on all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
<flag name="atapromise">Support for Promise PDC2026x (FastTrak/Ultra)</flag>
diff --git a/sys-apps/flock/metadata.xml b/sys-apps/flock/metadata.xml
index ecedda4aa2c..d7caf7d3b1d 100644
--- a/sys-apps/flock/metadata.xml
+++ b/sys-apps/flock/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-apps/fwcrv/metadata.xml b/sys-apps/fwcrv/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/fwcrv/metadata.xml
+++ b/sys-apps/fwcrv/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-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index e88fa58c8b9..1da8c574561 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/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="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag>
</use>
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index 39f028c585a..90f461d063d 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/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>williamh@gentoo.org</email>
</maintainer>
<maintainer>
<email>blueness@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription lang="en">
This package contains base shell functions which are required by
all Gentoo systems.
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 35d2907b862..015ae9d7108 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="fat">Include FAT16/FAT32 support
(<pkg>sys-fs/dosfstools</pkg>)</flag>
diff --git a/sys-apps/gradm/metadata.xml b/sys-apps/gradm/metadata.xml
index e217c373347..724bcb3aaef 100644
--- a/sys-apps/gradm/metadata.xml
+++ b/sys-apps/gradm/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>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index 0343844b82f..4b731249947 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/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:gnu:grep</remote-id>
</upstream>
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/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-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
index 4972d3e5fa9..b75ea6d48df 100644
--- a/sys-apps/gscanbus/metadata.xml
+++ b/sys-apps/gscanbus/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">gscanbus.berlios</remote-id>
</upstream>
diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
index 9d109ee85cd..111ecadf749 100644
--- a/sys-apps/gsmartcontrol/metadata.xml
+++ b/sys-apps/gsmartcontrol/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">gsmartcontrol</remote-id>
</upstream>
diff --git a/sys-apps/haveged/metadata.xml b/sys-apps/haveged/metadata.xml
index 8f0080c5772..464439108db 100644
--- a/sys-apps/haveged/metadata.xml
+++ b/sys-apps/haveged/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>sysadmin</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
index fd5f3b8c07f..353ca336a74 100644
--- a/sys-apps/hbaapi/metadata.xml
+++ b/sys-apps/hbaapi/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">hbaapi</remote-id>
</upstream>
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index 8adcecd9fc9..2e0fb1fd483 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/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">hdparm</remote-id>
</upstream>
diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/help2man/metadata.xml
+++ b/sys-apps/help2man/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-apps/hprofile/metadata.xml b/sys-apps/hprofile/metadata.xml
index b0be56990d5..838d69e88d3 100644
--- a/sys-apps/hprofile/metadata.xml
+++ b/sys-apps/hprofile/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">tokiclover/hprofile</remote-id>
</upstream>
diff --git a/sys-apps/hwdata-gentoo/metadata.xml b/sys-apps/hwdata-gentoo/metadata.xml
index 1ac2ea9fcff..bc8c92e36a5 100644
--- a/sys-apps/hwdata-gentoo/metadata.xml
+++ b/sys-apps/hwdata-gentoo/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="binary-drivers">Adds support for ATI/NVIDIA binary
drivers</flag>
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index be6e3795baa..6d23734d42d 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/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>base-system</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
@@ -11,6 +10,10 @@
<maintainer>
<email>floppym@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="net">Install the oui.txt and iab.txt databases</flag>
<flag name="pci">Install the pci.ids database</flag>
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index fbf6b304adf..b151b17d84e 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/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>
The Portable Hardware Locality (hwloc) software package provides a portable abstraction
(across OS, versions, architectures, ...) of the hierarchical topology of modern architectures,
diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml
index 88653ddd717..ec3067b686e 100644
--- a/sys-apps/hwsetup/metadata.xml
+++ b/sys-apps/hwsetup/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-apps/ibm-powerpc-utils-papr/metadata.xml b/sys-apps/ibm-powerpc-utils-papr/metadata.xml
index f9a5b22fcbe..8278b9b25ff 100644
--- a/sys-apps/ibm-powerpc-utils-papr/metadata.xml
+++ b/sys-apps/ibm-powerpc-utils-papr/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>ppc64</herd>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/ibm-powerpc-utils/metadata.xml b/sys-apps/ibm-powerpc-utils/metadata.xml
index 6035c92dff1..14a17cab64c 100644
--- a/sys-apps/ibm-powerpc-utils/metadata.xml
+++ b/sys-apps/ibm-powerpc-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>ppc64</herd>
+ <maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+ </maintainer>
<use>
<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
</use>
diff --git a/sys-apps/ifd-gempc/metadata.xml b/sys-apps/ifd-gempc/metadata.xml
index 555d15559b1..74956f7da64 100644
--- a/sys-apps/ifd-gempc/metadata.xml
+++ b/sys-apps/ifd-gempc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
<longdescription>
This library provides PC/SC IFD handler implementation for Gemplus GemCore based
serial and USB smart cards readers.
diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index f3597af28c8..dd7cc549baf 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/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">
Brings up/down ethernet ports automatically with cable detection
</longdescription>
diff --git a/sys-apps/install-xattr/metadata.xml b/sys-apps/install-xattr/metadata.xml
index 8221a72b877..23116adc2b4 100644
--- a/sys-apps/install-xattr/metadata.xml
+++ b/sys-apps/install-xattr/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>blueness@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/intel-performance-counter-monitor/metadata.xml b/sys-apps/intel-performance-counter-monitor/metadata.xml
index c63b19ffc98..ae3a1c041b3 100644
--- a/sys-apps/intel-performance-counter-monitor/metadata.xml
+++ b/sys-apps/intel-performance-counter-monitor/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>brendan@horan.hk</email>
<name>Brendan 'undersys' Horan</name>
<description>Primary Maintainer, Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index b8bcac27255..15bab03b17c 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/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="openipmi">Use the system OpenIPMI implementation.</flag>
<!-- <flag name='freeipmi'>Use the system FreeIPMI implementation.</flag> -->
diff --git a/sys-apps/ipmiutil/metadata.xml b/sys-apps/ipmiutil/metadata.xml
index 80daff45553..2757ee6b151 100644
--- a/sys-apps/ipmiutil/metadata.xml
+++ b/sys-apps/ipmiutil/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">ipmiutil</remote-id>
</upstream>
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 3a1e60d4b61..e6b2a740b66 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/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">build programs that use berkdb (just arpd)</flag>
<flag name="iptables">include support for iptables filtering</flag>
diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 2d6ba73d5cc..d2a75d7f38e 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/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="numa">Support balancing IRQs across NUMA nodes</flag>
</use>
diff --git a/sys-apps/isapnptools/metadata.xml b/sys-apps/isapnptools/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/isapnptools/metadata.xml
+++ b/sys-apps/isapnptools/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-apps/iucode_tool/metadata.xml b/sys-apps/iucode_tool/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/iucode_tool/metadata.xml
+++ b/sys-apps/iucode_tool/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-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index f862d255f20..86b66790986 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/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="freshmeat">kbd</remote-id>
</upstream>
diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml
index 6aa7d215c33..dd032aa6105 100644
--- a/sys-apps/kexec-tools/metadata.xml
+++ b/sys-apps/kexec-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>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<use>
<flag name="lzma">Enables support for LZMA compressed kernel images</flag>
<flag name="booke">Include support for Book-E memory management</flag>
diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 115f26ac871..082c7ae4c6b 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 879bcfc7eac..0656e2e9eda 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/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>udev-bugs@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="lzma">Enable support for XZ compressed modules</flag>
<flag name="tools">Install module loading/unloading tools.</flag>
diff --git a/sys-apps/lcdsplash/metadata.xml b/sys-apps/lcdsplash/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/lcdsplash/metadata.xml
+++ b/sys-apps/lcdsplash/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-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml
index 69fdf497f63..7d6261f688b 100644
--- a/sys-apps/lcdtest/metadata.xml
+++ b/sys-apps/lcdtest/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
</maintainer>
<maintainer>
<email>nikoli@gmx.us</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 391e43567a6..8237fee11b2 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/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>mips</herd>
<maintainer>
<email>mips@gentoo.org</email>
<name>Mips Team</name>
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/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-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
index d41a15e9ead..043386114d9 100644
--- a/sys-apps/likwid/metadata.xml
+++ b/sys-apps/likwid/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>brendan@horan.hk</email>
<name>Brendan Horan</name>
<description>Proxy - Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">rrze-likwid/likwid</remote-id>
</upstream>
diff --git a/sys-apps/lkcdutils/metadata.xml b/sys-apps/lkcdutils/metadata.xml
index fc290a9782b..7e1cefa1e7b 100644
--- a/sys-apps/lkcdutils/metadata.xml
+++ b/sys-apps/lkcdutils/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>s390</herd>
<maintainer>
<email>s390@gentoo.org</email>
</maintainer>
diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
index 7ece2d9da04..f8a0f573530 100644
--- a/sys-apps/logwatch/metadata.xml
+++ b/sys-apps/logwatch/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">logwatch</remote-id>
</upstream>
diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml
index 56244816bc2..ed27c1ccfa2 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/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>blshkv@pentoo.ch</email>
<name>Anton Bolshakov</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/lsadb/metadata.xml b/sys-apps/lsadb/metadata.xml
index e75d5a5857f..c8871ebc60c 100644
--- a/sys-apps/lsadb/metadata.xml
+++ b/sys-apps/lsadb/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-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/lshw/metadata.xml
+++ b/sys-apps/lshw/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-apps/lssbus/metadata.xml b/sys-apps/lssbus/metadata.xml
index 343785db626..0ced116759c 100644
--- a/sys-apps/lssbus/metadata.xml
+++ b/sys-apps/lssbus/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>sparc</herd>
<maintainer>
<email>sparc@gentoo.org</email>
<name>Sparc Team</name>
diff --git a/sys-apps/makedev/metadata.xml b/sys-apps/makedev/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/makedev/metadata.xml
+++ b/sys-apps/makedev/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-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml
index 77ec25b3f53..00896cce450 100644
--- a/sys-apps/man-db/metadata.xml
+++ b/sys-apps/man-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>
<use>
<flag name="manpager">Enable manpager wrapper for colorizing output</flag>
</use>
diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/man-pages-posix/metadata.xml
+++ b/sys-apps/man-pages-posix/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-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/man-pages/metadata.xml
+++ b/sys-apps/man-pages/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-apps/man/metadata.xml b/sys-apps/man/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/man/metadata.xml
+++ b/sys-apps/man/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-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/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-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index b7d0c5d90ac..f59af2bdd5e 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/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="serial">Compile with serial console support</flag>
<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml
index 501bf344889..68c3f8af3d3 100644
--- a/sys-apps/memtest86/metadata.xml
+++ b/sys-apps/memtest86/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="serial">Compile with serial console support</flag>
</use>
diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/memtester/metadata.xml
+++ b/sys-apps/memtester/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-apps/microcode-ctl/metadata.xml b/sys-apps/microcode-ctl/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/microcode-ctl/metadata.xml
+++ b/sys-apps/microcode-ctl/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-apps/microcode-data/metadata.xml b/sys-apps/microcode-data/metadata.xml
index 31da8f56612..7ae77b8746e 100644
--- a/sys-apps/microcode-data/metadata.xml
+++ b/sys-apps/microcode-data/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="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
diff --git a/sys-apps/minised/metadata.xml b/sys-apps/minised/metadata.xml
index 80f59b50e3e..652642c3e7f 100644
--- a/sys-apps/minised/metadata.xml
+++ b/sys-apps/minised/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>embedded</herd>
-<herd>base-system</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/miscfiles/metadata.xml
+++ b/sys-apps/miscfiles/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-apps/mlocate/metadata.xml b/sys-apps/mlocate/metadata.xml
index a6e25f02c16..74bfcb4844c 100644
--- a/sys-apps/mlocate/metadata.xml
+++ b/sys-apps/mlocate/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>fauli@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/modutils/metadata.xml
+++ b/sys-apps/modutils/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-apps/most/metadata.xml b/sys-apps/most/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/sys-apps/most/metadata.xml
+++ b/sys-apps/most/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/mount-gtk/metadata.xml b/sys-apps/mount-gtk/metadata.xml
index e734d7e194f..b973f5fe77e 100644
--- a/sys-apps/mount-gtk/metadata.xml
+++ b/sys-apps/mount-gtk/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mount-gtk</remote-id>
</upstream>
diff --git a/sys-apps/mouseemu/metadata.xml b/sys-apps/mouseemu/metadata.xml
index 034c09eb248..8278b9b25ff 100644
--- a/sys-apps/mouseemu/metadata.xml
+++ b/sys-apps/mouseemu/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-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 8823935a52f..82c345f228d 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/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">archiecobbs/mtree-port</remote-id>
</upstream>
diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
index 1db5b5c14e5..b864b373732 100644
--- a/sys-apps/nawk/metadata.xml
+++ b/sys-apps/nawk/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>ottxor@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 870f1d0493e..b046567ad8e 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
<flag name="hostname">build the hostname and dnsdomainname tools</flag>
diff --git a/sys-apps/netboot-base/metadata.xml b/sys-apps/netboot-base/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/netboot-base/metadata.xml
+++ b/sys-apps/netboot-base/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-apps/netkit-base/metadata.xml b/sys-apps/netkit-base/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/netkit-base/metadata.xml
+++ b/sys-apps/netkit-base/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-apps/netloc/metadata.xml b/sys-apps/netloc/metadata.xml
index 91d88c8a551..9c0b89c81f4 100644
--- a/sys-apps/netloc/metadata.xml
+++ b/sys-apps/netloc/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>
The Portable Network Locality (netloc) software package provides network topology discovery tools, and an abstract representation of those networks topologies for a range of network types and configurations. It is provided as a companion to the Portable Hardware Locality (hwloc) package. These two software packages work together to provide a comprehensive view of the HPC system topology, spanning from the processor cores in one server to the cores in another – including the complex network(s) in between.
</longdescription>
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index fd42ddba1a6..8bee419abd5 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/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>openrc</herd>
+ <maintainer>
+ <email>openrc@gentoo.org</email>
+ <name>Gentoo OpenRC Project</name>
+ </maintainer>
<use>
<flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
<flag name="newnet">enable the new network stack (experimental)</flag>
diff --git a/sys-apps/paxctl/metadata.xml b/sys-apps/paxctl/metadata.xml
index e217c373347..724bcb3aaef 100644
--- a/sys-apps/paxctl/metadata.xml
+++ b/sys-apps/paxctl/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>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/paxctld/metadata.xml b/sys-apps/paxctld/metadata.xml
index e217c373347..724bcb3aaef 100644
--- a/sys-apps/paxctld/metadata.xml
+++ b/sys-apps/paxctld/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>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index b1fff3cac2d..c6e26887436 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/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="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index b7272f79812..e76beb23749 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<longdescription>
PC/SC Architecture smartcard middleware library
</longdescription>
diff --git a/sys-apps/pcsc-slb-rf72-drv/metadata.xml b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
index d68fe974c15..dd564d89eb8 100644
--- a/sys-apps/pcsc-slb-rf72-drv/metadata.xml
+++ b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>crypto</herd>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml
index b36423b9e2f..87a1158f489 100644
--- a/sys-apps/pcsc-tools/metadata.xml
+++ b/sys-apps/pcsc-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>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<longdescription>User tools for PC/SC SmartCard access (including pcsc_scan and the gscriptor GUI).</longdescription>
<use>
diff --git a/sys-apps/pmount-gui/metadata.xml b/sys-apps/pmount-gui/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/sys-apps/pmount-gui/metadata.xml
+++ b/sys-apps/pmount-gui/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-apps/powerpc-utils/metadata.xml b/sys-apps/powerpc-utils/metadata.xml
index 034c09eb248..8278b9b25ff 100644
--- a/sys-apps/powerpc-utils/metadata.xml
+++ b/sys-apps/powerpc-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>ppc</herd>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index dc84e004c37..3062e284528 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/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>ia64</herd>
+ <maintainer>
+ <email>ia64@gentoo.org</email>
+ <name>Gentoo Linux IA-64 Development</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">prctl</remote-id>
</upstream>
diff --git a/sys-apps/prefix-chain-utils/metadata.xml b/sys-apps/prefix-chain-utils/metadata.xml
index 46dee96f4e7..fd87a77caa6 100644
--- a/sys-apps/prefix-chain-utils/metadata.xml
+++ b/sys-apps/prefix-chain-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>prefix</herd>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/qcontrol/metadata.xml b/sys-apps/qcontrol/metadata.xml
index 56901798a2d..a593b252a27 100644
--- a/sys-apps/qcontrol/metadata.xml
+++ b/sys-apps/qcontrol/metadata.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>arm</herd>
-<herd>embedded</herd>
<maintainer>
<email>armin76@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>arm@gentoo.org</email>
+ <name>Gentoo Linux ARM Development</name>
+</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/qdiskusage/metadata.xml b/sys-apps/qdiskusage/metadata.xml
index 76975b5fa13..d5286874af2 100644
--- a/sys-apps/qdiskusage/metadata.xml
+++ b/sys-apps/qdiskusage/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index 9a95f045461..f2c2e5ed670 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/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="consolekit">Enable native consolekit support</flag>
<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
diff --git a/sys-apps/readahead-list/metadata.xml b/sys-apps/readahead-list/metadata.xml
index b314bee0daf..0b1d246b3f1 100644
--- a/sys-apps/readahead-list/metadata.xml
+++ b/sys-apps/readahead-list/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>Upstream author as well as maintainer for Gentoo.</description>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/rename/metadata.xml b/sys-apps/rename/metadata.xml
index a3f7d00f6d4..19802805f3d 100644
--- a/sys-apps/rename/metadata.xml
+++ b/sys-apps/rename/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">rename</remote-id>
</upstream>
diff --git a/sys-apps/rescan-scsi-bus/metadata.xml b/sys-apps/rescan-scsi-bus/metadata.xml
index 115f26ac871..082c7ae4c6b 100644
--- a/sys-apps/rescan-scsi-bus/metadata.xml
+++ b/sys-apps/rescan-scsi-bus/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 51198234996..dc5a10a59e9 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>idella4@gentoo.org</email>
</maintainer>
@@ -11,6 +9,14 @@
<name>Gokturk Yuksek</name>
<description>Proxy maintainer, CC him on bugs.</description>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">gkernel</remote-id>
</upstream>
diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml
index d89f5d95cc7..6e3b5010bd7 100644
--- a/sys-apps/roccat-tools/metadata.xml
+++ b/sys-apps/roccat-tools/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>dpisklov@gmail.com</email>
<name>Dmitry Pisklov</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="lua">Build support for Lua scripting for RyosMKPro ripple effects</flag>
<flag name="lua51">Build support for Lua scripting for RyosMKPro ripple effects - support lua 5.1</flag>
diff --git a/sys-apps/rsbac-admin/metadata.xml b/sys-apps/rsbac-admin/metadata.xml
index cb485827c1c..d4f673008b1 100644
--- a/sys-apps/rsbac-admin/metadata.xml
+++ b/sys-apps/rsbac-admin/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>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<longdescription lang="en">
Administrative tool for RSBAC system
</longdescription>
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 87e1df2ef2d..e925a75b0d3 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/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>s390</herd>
<maintainer>
<email>s390@gentoo.org</email>
</maintainer>
diff --git a/sys-apps/salinfo/metadata.xml b/sys-apps/salinfo/metadata.xml
index fe15722775f..6d143f6923f 100644
--- a/sys-apps/salinfo/metadata.xml
+++ b/sys-apps/salinfo/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>ia64</herd>
+<maintainer>
+ <email>ia64@gentoo.org</email>
+ <name>Gentoo Linux IA-64 Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
index a9c5573a17e..e3d1184f968 100644
--- a/sys-apps/sdparm/metadata.xml
+++ b/sys-apps/sdparm/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">
Utility to output and modify parameters on a SCSI device, like hdparm.
</longdescription>
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index 2dbbb3b4d15..49350b102cb 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/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">sed</remote-id>
</upstream>
diff --git a/sys-apps/servicelog/metadata.xml b/sys-apps/servicelog/metadata.xml
index 09b995174c2..55b6e6055e0 100644
--- a/sys-apps/servicelog/metadata.xml
+++ b/sys-apps/servicelog/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-apps/setserial/metadata.xml b/sys-apps/setserial/metadata.xml
index 0ad0b26d0ff..12aeff74c15 100644
--- a/sys-apps/setserial/metadata.xml
+++ b/sys-apps/setserial/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">setserial</remote-id>
</upstream>
diff --git a/sys-apps/sg3_utils/metadata.xml b/sys-apps/sg3_utils/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/sg3_utils/metadata.xml
+++ b/sys-apps/sg3_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-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index aed121abca0..c7715d5c95d 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>pam</herd> <!-- only for USE=pam -->
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer> <maintainer>
+ <email>pam-bugs@gentoo.org</email>
+ <name>Pluggable Authentication Method maintenance</name>
+ </maintainer> <!-- only for USE=pam -->
<upstream>
<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
</upstream>
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 451606b9ff9..e7dcd3d81bc 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/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="minimal">Do not install the monitoring daemon and associated scripts.</flag>
</use>
diff --git a/sys-apps/sparc-utils/metadata.xml b/sys-apps/sparc-utils/metadata.xml
index 3c434d165f0..5c7104058f4 100644
--- a/sys-apps/sparc-utils/metadata.xml
+++ b/sys-apps/sparc-utils/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>sparc</herd>
<maintainer>
<email>sparc@gentoo.org</email>
<name>Sparc Team</name>
diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
index 66d681f02bc..bf648a9d109 100644
--- a/sys-apps/syscriptor/metadata.xml
+++ b/sys-apps/syscriptor/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">syscriptor</remote-id>
</upstream>
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
index 354c39064a7..2a7f05b577c 100644
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ b/sys-apps/tcp-wrappers/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="netgroups">
Support matching NIS (host) netgroup names via the @netgroup syntax
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/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-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
index 4886a60a349..0606541e73a 100644
--- a/sys-apps/timer_entropyd/metadata.xml
+++ b/sys-apps/timer_entropyd/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>pavel.stratil-jun@fenix.cz</email>
<description>Proxied co-maintainer, assign bugs to him</description>
@@ -9,6 +8,10 @@
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="debug">Enable printf debugging and logging to the syslog at DEBUG level</flag>
</use>
diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
index 5f216ff5119..daaf46630de 100644
--- a/sys-apps/tuxonice-userui/metadata.xml
+++ b/sys-apps/tuxonice-userui/metadata.xml
@@ -5,7 +5,10 @@
<email>arfrever.fta@gmail.com</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="fbsplash">Add support for framebuffer splash</flag>
</use>
diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index 2b14dbd77d8..51054a1158f 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/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 package contains a proxy program that passes data back and forth
between two connections set up by a UCSPI server and a UCSPI client.
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index adbdc3c6c19..00b8b7ec98e 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>powerman-asdf@yandex.ru</email>
<description>Primary maintainer</description>
<name>Alex Efros</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>sslserver and sslclient are command-line tools for building SSL
client-server applications. They conform to the UNIX Client-Server Program
Interface, UCSPI.</longdescription>
diff --git a/sys-apps/ucspi-tcp/metadata.xml b/sys-apps/ucspi-tcp/metadata.xml
index 692f0c88054..10f6de70b88 100644
--- a/sys-apps/ucspi-tcp/metadata.xml
+++ b/sys-apps/ucspi-tcp/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>qmail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<longdescription>
ucspi-tcp is a replacement for inetd. It consists of tcpserver and
tcpclient. tcpserver can listen on sockets and start programs in an
diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
index ada679eb0fd..44436e1e6a7 100644
--- a/sys-apps/ucspi-unix/metadata.xml
+++ b/sys-apps/ucspi-unix/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 package contains UNIX domain socket client and server programs that
conform to UCSPI, the UNIX Client-Server Program Interface.
diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml
index 0bd37e4f04e..05e6770b325 100644
--- a/sys-apps/udevil/metadata.xml
+++ b/sys-apps/udevil/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>zlg@gentoo.org</email>
<name>Daniel Campbell</name>
@@ -10,6 +9,10 @@
<email>ThyArmageddon+Gentoo@Gmail.com</email>
<name>Elijah El Lazkani</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">IgnorantGuru/udevil</remote-id>
</upstream>
diff --git a/sys-apps/uevt/metadata.xml b/sys-apps/uevt/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/sys-apps/uevt/metadata.xml
+++ b/sys-apps/uevt/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-apps/unscd/metadata.xml b/sys-apps/unscd/metadata.xml
index 686dc818edb..0c0a20a0e66 100644
--- a/sys-apps/unscd/metadata.xml
+++ b/sys-apps/unscd/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-apps/usb_modeswitch/metadata.xml b/sys-apps/usb_modeswitch/metadata.xml
index af365e2b752..642ffbcacea 100644
--- a/sys-apps/usb_modeswitch/metadata.xml
+++ b/sys-apps/usb_modeswitch/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>
<use>
<flag name="jimtcl">Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
</use>
@@ -9,4 +8,8 @@
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
+<maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-apps/usbredir/metadata.xml b/sys-apps/usbredir/metadata.xml
index 87124c27369..6aff4ed98b0 100644
--- a/sys-apps/usbredir/metadata.xml
+++ b/sys-apps/usbredir/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>qemu</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>qemu@gentoo.org</email>
+ <name>Gentoo QEMU Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
index c781cc1359a..ffdfc891be8 100644
--- a/sys-apps/usbutils/metadata.xml
+++ b/sys-apps/usbutils/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-usb</remote-id>
</upstream>
diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
index 23c2cea3bcd..60993815674 100644
--- a/sys-apps/utempter/metadata.xml
+++ b/sys-apps/utempter/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-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index bb391381802..837c4d3d30c 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/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="caps">build setpriv helper (run programs with diff capabilities)</flag>
<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
diff --git a/sys-apps/vbetool/metadata.xml b/sys-apps/vbetool/metadata.xml
index ad3f22a0b39..8609336f008 100644
--- a/sys-apps/vbetool/metadata.xml
+++ b/sys-apps/vbetool/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>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
index 01cea5d9c19..e51e059ab04 100644
--- a/sys-apps/watchdog/metadata.xml
+++ b/sys-apps/watchdog/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="nfs">enable support for checking nfs mounts</flag>
</use>
diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/which/metadata.xml
+++ b/sys-apps/which/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-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 115f26ac871..082c7ae4c6b 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 62a2acae78d..ec7918a4040 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/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="rpc">support RPC services</flag>
</use>
diff --git a/sys-apps/xmbmon/metadata.xml b/sys-apps/xmbmon/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/sys-apps/xmbmon/metadata.xml
+++ b/sys-apps/xmbmon/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-apps/zorroutils/metadata.xml b/sys-apps/zorroutils/metadata.xml
index 53b13c9739c..03b81fce82f 100644
--- a/sys-apps/zorroutils/metadata.xml
+++ b/sys-apps/zorroutils/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>m68k@gentoo.org</email>
</maintainer>
@@ -9,4 +8,8 @@
<email>gentoo@kolla.no</email>
<name>Kolbjørn Barmen</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>