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 /net-misc
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 'net-misc')
-rw-r--r--net-misc/apt-cacher-ng/metadata.xml5
-rw-r--r--net-misc/arm/metadata.xml5
-rw-r--r--net-misc/bopm/metadata.xml1
-rw-r--r--net-misc/bridge-utils/metadata.xml5
-rw-r--r--net-misc/bsdwhois/metadata.xml5
-rw-r--r--net-misc/cadaver/metadata.xml5
-rw-r--r--net-misc/capiisdnmon/metadata.xml1
-rw-r--r--net-misc/cfengine/metadata.xml5
-rw-r--r--net-misc/cgminer/metadata.xml5
-rw-r--r--net-misc/charm/metadata.xml5
-rw-r--r--net-misc/clamz/metadata.xml5
-rw-r--r--net-misc/clusterssh/metadata.xml5
-rw-r--r--net-misc/cmst/metadata.xml5
-rw-r--r--net-misc/connman/metadata.xml5
-rw-r--r--net-misc/corkscrew/metadata.xml5
-rw-r--r--net-misc/dhcdrop/metadata.xml5
-rw-r--r--net-misc/dhcp/metadata.xml5
-rw-r--r--net-misc/dhcpcd-ui/metadata.xml5
-rw-r--r--net-misc/dhcpcd/metadata.xml5
-rw-r--r--net-misc/dleyna-server/metadata.xml5
-rw-r--r--net-misc/dnetstats/metadata.xml5
-rw-r--r--net-misc/dropbear/metadata.xml5
-rw-r--r--net-misc/electrum/metadata.xml5
-rw-r--r--net-misc/ethercard-diag/metadata.xml5
-rw-r--r--net-misc/geoipupdate/metadata.xml5
-rw-r--r--net-misc/gnome-online-miners/metadata.xml5
-rw-r--r--net-misc/grdesktop/metadata.xml5
-rw-r--r--net-misc/gsasl/metadata.xml5
-rw-r--r--net-misc/gupnp-tools/metadata.xml5
-rw-r--r--net-misc/gvrpcd/metadata.xml5
-rw-r--r--net-misc/gwget/metadata.xml5
-rw-r--r--net-misc/hsc/metadata.xml5
-rw-r--r--net-misc/httptype/metadata.xml5
-rw-r--r--net-misc/hylafaxplus/metadata.xml1
-rw-r--r--net-misc/iaxmodem/metadata.xml1
-rw-r--r--net-misc/ices/metadata.xml5
-rw-r--r--net-misc/iodine/metadata.xml5
-rw-r--r--net-misc/ip-sentinel/metadata.xml5
-rw-r--r--net-misc/ipcalc/metadata.xml5
-rw-r--r--net-misc/iperf/metadata.xml5
-rw-r--r--net-misc/iputils/metadata.xml5
-rw-r--r--net-misc/ipv6calc/metadata.xml5
-rw-r--r--net-misc/ixp4xx/metadata.xml10
-rw-r--r--net-misc/java-wakeonlan/metadata.xml5
-rw-r--r--net-misc/jrdesktop/metadata.xml5
-rw-r--r--net-misc/jwhois/metadata.xml5
-rw-r--r--net-misc/kea/metadata.xml5
-rw-r--r--net-misc/keychain/metadata.xml10
-rw-r--r--net-misc/knemo/metadata.xml5
-rw-r--r--net-misc/knutclient/metadata.xml5
-rw-r--r--net-misc/ksshaskpass/metadata.xml5
-rw-r--r--net-misc/kvpnc/metadata.xml5
-rw-r--r--net-misc/lanmap/metadata.xml5
-rw-r--r--net-misc/lcr/metadata.xml5
-rw-r--r--net-misc/libres3/metadata.xml10
-rw-r--r--net-misc/libteam/metadata.xml1
-rw-r--r--net-misc/linux-eoip/metadata.xml5
-rw-r--r--net-misc/livestreamer/metadata.xml5
-rw-r--r--net-misc/lksctp-tools/metadata.xml5
-rw-r--r--net-misc/logmein-hamachi/metadata.xml5
-rw-r--r--net-misc/mdidentd/metadata.xml1
-rw-r--r--net-misc/mediatomb/metadata.xml5
-rw-r--r--net-misc/mindterm/metadata.xml5
-rw-r--r--net-misc/mobile-broadband-provider-info/metadata.xml5
-rw-r--r--net-misc/modemmanager/metadata.xml5
-rw-r--r--net-misc/nemesis/metadata.xml5
-rw-r--r--net-misc/netfleet/metadata.xml5
-rw-r--r--net-misc/netkit-fingerd/metadata.xml5
-rw-r--r--net-misc/netkit-rsh/metadata.xml5
-rw-r--r--net-misc/netkit-rwho/metadata.xml5
-rw-r--r--net-misc/netpipes/metadata.xml5
-rw-r--r--net-misc/netstat-nat/metadata.xml5
-rw-r--r--net-misc/networkmanager-openconnect/metadata.xml7
-rw-r--r--net-misc/networkmanager-openswan/metadata.xml7
-rw-r--r--net-misc/networkmanager-openvpn/metadata.xml7
-rw-r--r--net-misc/networkmanager-pptp/metadata.xml7
-rw-r--r--net-misc/networkmanager-sstp/metadata.xml5
-rw-r--r--net-misc/networkmanager-vpnc/metadata.xml7
-rw-r--r--net-misc/networkmanager/metadata.xml5
-rw-r--r--net-misc/npapi-sdk/metadata.xml5
-rw-r--r--net-misc/ntp/metadata.xml5
-rw-r--r--net-misc/nx/metadata.xml5
-rw-r--r--net-misc/nxplayer/metadata.xml5
-rw-r--r--net-misc/openntpd/metadata.xml5
-rw-r--r--net-misc/openssh-blacklist/metadata.xml5
-rw-r--r--net-misc/openssh/metadata.xml5
-rw-r--r--net-misc/openvswitch/metadata.xml5
-rw-r--r--net-misc/packETH/metadata.xml5
-rw-r--r--net-misc/pavuk/metadata.xml5
-rw-r--r--net-misc/pipes/metadata.xml5
-rw-r--r--net-misc/polly/metadata.xml5
-rw-r--r--net-misc/pps-tools/metadata.xml5
-rw-r--r--net-misc/pssh/metadata.xml5
-rw-r--r--net-misc/ptpd/metadata.xml5
-rw-r--r--net-misc/pycnb/metadata.xml5
-rw-r--r--net-misc/pyhoca-cli/metadata.xml5
-rw-r--r--net-misc/pyhoca-gui/metadata.xml5
-rw-r--r--net-misc/pymazon/metadata.xml5
-rw-r--r--net-misc/python-x2go/metadata.xml5
-rw-r--r--net-misc/qtm/metadata.xml5
-rw-r--r--net-misc/rancid-git/metadata.xml5
-rw-r--r--net-misc/rancid/metadata.xml5
-rw-r--r--net-misc/redir/metadata.xml5
-rw-r--r--net-misc/rsync/metadata.xml5
-rw-r--r--net-misc/rygel/metadata.xml5
-rw-r--r--net-misc/s3cmd/metadata.xml5
-rw-r--r--net-misc/samplicator/metadata.xml5
-rw-r--r--net-misc/ser2net/metadata.xml5
-rw-r--r--net-misc/shout/metadata.xml5
-rw-r--r--net-misc/sitecopy/metadata.xml7
-rw-r--r--net-misc/slimrat/metadata.xml5
-rw-r--r--net-misc/smb4k/metadata.xml5
-rw-r--r--net-misc/smbc/metadata.xml5
-rw-r--r--net-misc/socat/metadata.xml5
-rw-r--r--net-misc/spice-gtk/metadata.xml5
-rw-r--r--net-misc/ssh-askpass-fullscreen/metadata.xml5
-rw-r--r--net-misc/sshpass/metadata.xml5
-rw-r--r--net-misc/sstp-client/metadata.xml5
-rw-r--r--net-misc/stargazer/metadata.xml5
-rw-r--r--net-misc/streamtuner/metadata.xml5
-rw-r--r--net-misc/suite3270/metadata.xml10
-rw-r--r--net-misc/switzerland/metadata.xml5
-rw-r--r--net-misc/sx/metadata.xml5
-rw-r--r--net-misc/tcpsound/metadata.xml5
-rw-r--r--net-misc/teamviewer/metadata.xml5
-rw-r--r--net-misc/termpkg/metadata.xml1
-rw-r--r--net-misc/tipcutils/metadata.xml5
-rw-r--r--net-misc/ucarp/metadata.xml5
-rw-r--r--net-misc/udpcast/metadata.xml5
-rw-r--r--net-misc/uftp/metadata.xml5
-rw-r--r--net-misc/unison/metadata.xml5
-rw-r--r--net-misc/vconfig/metadata.xml5
-rw-r--r--net-misc/vde/metadata.xml5
-rw-r--r--net-misc/vinagre/metadata.xml5
-rw-r--r--net-misc/vino/metadata.xml5
-rw-r--r--net-misc/vpnc/metadata.xml5
-rw-r--r--net-misc/wget/metadata.xml5
-rw-r--r--net-misc/whois/metadata.xml5
-rw-r--r--net-misc/x2goclient/metadata.xml5
-rw-r--r--net-misc/x2goserver/metadata.xml5
-rw-r--r--net-misc/yandex-disk/metadata.xml5
-rw-r--r--net-misc/ytalk/metadata.xml5
142 files changed, 562 insertions, 152 deletions
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 0322df9ead6..c870f481260 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-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>deb-tools</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+<email>deb-tools@gentoo.org</email>
+<name>Gentoo Debian Tools Project</name>
+</maintainer>
<use>
<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
</use>
diff --git a/net-misc/arm/metadata.xml b/net-misc/arm/metadata.xml
index 9134ba92a2e..3449cfe1d8c 100644
--- a/net-misc/arm/metadata.xml
+++ b/net-misc/arm/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -14,4 +13,8 @@
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-irc</herd>
</pkgmetadata>
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 61bd84d24cc..b5111b4fa10 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-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>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">bridge</remote-id>
</upstream>
diff --git a/net-misc/bsdwhois/metadata.xml b/net-misc/bsdwhois/metadata.xml
index ecedda4aa2c..d7caf7d3b1d 100644
--- a/net-misc/bsdwhois/metadata.xml
+++ b/net-misc/bsdwhois/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/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 72e4e11f0b8..5707ccd1451 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/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>proxy-maintainers</herd>
<maintainer>
<email>arfrever.fta@gmail.com</email>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/capiisdnmon/metadata.xml b/net-misc/capiisdnmon/metadata.xml
index 5313bf560f2..e6bf403e063 100644
--- a/net-misc/capiisdnmon/metadata.xml
+++ b/net-misc/capiisdnmon/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
<longdescription>A CAPI 2.0 ISDN call monitor with LDAP name resolution</longdescription>
<longdescription lang="ja">CAPI 2.0 ISDN は LDAP の名前解決の様子を表示します。</longdescription>
<upstream>
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 4efd6988c9a..717ab7f7f42 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/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>sysadmin</herd>
<maintainer>
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
@@ -12,6 +11,10 @@
<name>Marc Schiffbauer</name>
<description>cfengine &gt;2.x only</description>
</maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<use>
<flag name="html">Install HTML documentation</flag>
<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 3ffd4b4c186..812227cb9e3 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/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>ki@baka.bakka.su</email>
<description>In baka-bakka overlay.</description>
@@ -10,6 +9,10 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="ants1">Enable support for Antminer S1 Bitmain</flag>
<flag name="ants2">Enable support for Antminer S2 Bitmain</flag>
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
index 7a8af9a8b7c..601134e0f97 100644
--- a/net-misc/charm/metadata.xml
+++ b/net-misc/charm/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ljcharm</remote-id>
</upstream>
diff --git a/net-misc/clamz/metadata.xml b/net-misc/clamz/metadata.xml
index e5d9d408ffc..9f9ded9f39a 100644
--- a/net-misc/clamz/metadata.xml
+++ b/net-misc/clamz/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">clamz</remote-id>
</upstream>
diff --git a/net-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
index fc61ef0d838..7e42e9a3bae 100644
--- a/net-misc/clusterssh/metadata.xml
+++ b/net-misc/clusterssh/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 lang="en">
ClusterSSH is a tool for making the same change on multiple servers
at the same time. The 'cssh' command opens an administration console
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 607b1687ee0..77b82cf8aac 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
<remote-id type="github">andrew-bibb/cmst</remote-id>
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 1e04da18cf5..b5f1baa10e9 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/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>balint@szentedwg.ro</email>
<name>Bálint Szente</name>
@@ -12,6 +11,10 @@
<name>Yixun Lan</name>
<description>Co Maintainer, CC bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="ethernet">Enable ethernet support.</flag>
<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
diff --git a/net-misc/corkscrew/metadata.xml b/net-misc/corkscrew/metadata.xml
index eb5fbf2a758..5f1a4d657dd 100644
--- a/net-misc/corkscrew/metadata.xml
+++ b/net-misc/corkscrew/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>
<longdescription>
Corkscrew is a tool for tunneling SSH through HTTP proxies.
</longdescription>
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
index 42486af8aab..4d33617f079 100644
--- a/net-misc/dhcdrop/metadata.xml
+++ b/net-misc/dhcdrop/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>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Uility for tracing and neutralizing(blocking) fake DHCP
servers in Ethernet. Supports various modes. Theres possibility
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
index a2fff7185c1..206e82b6874 100644
--- a/net-misc/dhcp/metadata.xml
+++ b/net-misc/dhcp/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">The ISC DHCP client/server package.</longdescription>
<longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
<use>
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 8605a1493a9..f31ffbf8641 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/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>tokiclover@gmail.com</email>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="gtk3">
Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 202e48827a1..308e6e3a0e2 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
<maintainer>
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
</upstream>
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-misc/dleyna-server/metadata.xml
+++ b/net-misc/dleyna-server/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/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
index dc439f7e84f..4f773f3cebf 100644
--- a/net-misc/dnetstats/metadata.xml
+++ b/net-misc/dnetstats/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
index 5ac579bf073..b57924f9b14 100644
--- a/net-misc/dropbear/metadata.xml
+++ b/net-misc/dropbear/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>
<longdescription>
I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard
disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 7f347f631bf..95879f1c01d 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -18,6 +17,10 @@
<email>emery@vfemail.net</email>
<name>Emery Hemingway</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="cli">Enables the CLI interface</flag>
<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
diff --git a/net-misc/ethercard-diag/metadata.xml b/net-misc/ethercard-diag/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/ethercard-diag/metadata.xml
+++ b/net-misc/ethercard-diag/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/net-misc/geoipupdate/metadata.xml b/net-misc/geoipupdate/metadata.xml
index e0abfd5b2db..7574996a6f3 100644
--- a/net-misc/geoipupdate/metadata.xml
+++ b/net-misc/geoipupdate/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">maxmind/geoipupdate</remote-id>
</upstream>
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
index fb25ea5891b..e12aaf03d9a 100644
--- a/net-misc/gnome-online-miners/metadata.xml
+++ b/net-misc/gnome-online-miners/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="flickr">Enable Flickr support</flag>
</use>
diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml
index a37eac5342b..7a288dfa1ab 100644
--- a/net-misc/grdesktop/metadata.xml
+++ b/net-misc/grdesktop/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription>Gtk2 frontend for rdesktop</longdescription>
<longdescription lang="ja">リモート・デスクトップの GTK2 フロントエンドです。</longdescription>
</pkgmetadata>
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 4a94c4a7f8f..3016618650d 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="gcrypt">
Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-misc/gupnp-tools/metadata.xml
+++ b/net-misc/gupnp-tools/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index 0a34bcaad2c..9d954f4229b 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/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>azamat.hackimov@gmail.com</email>
<name>Azamat H. Hackimov</name>
@@ -12,4 +11,8 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/gwget/metadata.xml b/net-misc/gwget/metadata.xml
index 9359a065c80..4d37232aa03 100644
--- a/net-misc/gwget/metadata.xml
+++ b/net-misc/gwget/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>Gwget2 is a gtk2 front-end for the wget program. Wget is commonly used for retrieving files from the internet, and with an easy to use gtk2 interface, gwget2 brings the utility of wget to the GNOME desktop. Gwget2 supports drag and drop from most gtk2 compatible browsers, as well as the ability to pause and continue downloads over sessions.</longdescription>
<longdescription lang="ja">
Gwget2 は wget プログラムの GTK2 フロントエンドです。wget とはインターネットからファイルを回収するのに一般的に
diff --git a/net-misc/hsc/metadata.xml b/net-misc/hsc/metadata.xml
index 2193d772e35..3409127f534 100644
--- a/net-misc/hsc/metadata.xml
+++ b/net-misc/hsc/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
index c7ed39f7acc..85f78bd8583 100644
--- a/net-misc/httptype/metadata.xml
+++ b/net-misc/httptype/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">httptype</remote-id>
</upstream>
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index 69548ea8007..f44fa08f6fb 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
<maintainer>
<email>mattm@gentoo.org</email>
<name>Matthew Marlowe</name>
diff --git a/net-misc/iaxmodem/metadata.xml b/net-misc/iaxmodem/metadata.xml
index e81a784a2e5..2a3240f5b60 100644
--- a/net-misc/iaxmodem/metadata.xml
+++ b/net-misc/iaxmodem/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
<longdescription lang="en">
IAXmodem is a software modem written in C that uses an IAX channel
(commonly provided by an Asterisk PBX system) instead of a traditional
diff --git a/net-misc/ices/metadata.xml b/net-misc/ices/metadata.xml
index 3bf6bcfeb51..798a87bd625 100644
--- a/net-misc/ices/metadata.xml
+++ b/net-misc/ices/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/iodine/metadata.xml b/net-misc/iodine/metadata.xml
index 2fe9ba7b2dd..c1caab4cfd7 100644
--- a/net-misc/iodine/metadata.xml
+++ b/net-misc/iodine/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>vostorga@gentoo.org</email>
<name>Víctor Ostorga</name>
@@ -14,5 +13,9 @@
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>iodine lets you tunnel IPv4 data through a DNS server. This can be usable in different situations where internet access is firewalled, but DNS queries are allowed</longdescription>
</pkgmetadata>
diff --git a/net-misc/ip-sentinel/metadata.xml b/net-misc/ip-sentinel/metadata.xml
index d6c671a6f30..0af22b0ab1c 100644
--- a/net-misc/ip-sentinel/metadata.xml
+++ b/net-misc/ip-sentinel/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>
This program tries to prevent unauthorized usage of IPs within the local
ethernet broadcastdomain by giving an answer to ARP-requests. After receiving
diff --git a/net-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-misc/ipcalc/metadata.xml
+++ b/net-misc/ipcalc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 0ebec195cd1..5b58eafd18b 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">esnet/iperf</remote-id>
<remote-id type="sourceforge">iperf</remote-id>
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index b3de8ae6303..9b7fe83b229 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/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="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
<flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index f6baec0e296..13913ef923b 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/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>pva@gentoo.org</email>
<name>Peter Volkov</name>
@@ -10,4 +9,8 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/ixp4xx/metadata.xml b/net-misc/ixp4xx/metadata.xml
index 874dddb6a57..54f933baad7 100644
--- a/net-misc/ixp4xx/metadata.xml
+++ b/net-misc/ixp4xx/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>arm</herd>
-<herd>embedded</herd>
+<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/net-misc/java-wakeonlan/metadata.xml b/net-misc/java-wakeonlan/metadata.xml
index 838c00a4a44..6cb58e33adf 100644
--- a/net-misc/java-wakeonlan/metadata.xml
+++ b/net-misc/java-wakeonlan/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>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml
index 5db1b0e61f4..506f7157d6c 100644
--- a/net-misc/jrdesktop/metadata.xml
+++ b/net-misc/jrdesktop/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">
Java Remote Desktop (jrdesktop) is an open source software for viewing and/or controlling a distance PC.
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/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/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index 37c46d9c39d..38dce10c1d8 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 373a5008f7c..d21514d0e8f 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>drobbins@funtoo.org</email>
<name>Daniel Robbins</name>
<description>Upstream contact, please CC 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="github">funtoo/keychain</remote-id>
</upstream>
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-misc/knemo/metadata.xml
+++ b/net-misc/knemo/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-misc/knutclient/metadata.xml
+++ b/net-misc/knutclient/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/ksshaskpass/metadata.xml b/net-misc/ksshaskpass/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-misc/ksshaskpass/metadata.xml
+++ b/net-misc/ksshaskpass/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/kvpnc/metadata.xml b/net-misc/kvpnc/metadata.xml
index 8d36d5b01cd..710850e4961 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-misc/kvpnc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/lanmap/metadata.xml b/net-misc/lanmap/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-misc/lanmap/metadata.xml
+++ b/net-misc/lanmap/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
index 843e423a9cc..63cad2ea36e 100644
--- a/net-misc/lcr/metadata.xml
+++ b/net-misc/lcr/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>radio</herd>
+ <maintainer>
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
<use>
<flag name="asterisk">net-misc/asterisk channel driver</flag>
<flag name="misdn">net-misc/misdn driver</flag>
diff --git a/net-misc/libres3/metadata.xml b/net-misc/libres3/metadata.xml
index d41c60d2594..cdb074ca6c7 100644
--- a/net-misc/libres3/metadata.xml
+++ b/net-misc/libres3/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
LibreS3 adds an S3-compatibility layer over SX Cluster. With LibreS3 you access the data stored in your storage cluster using any existing S3 client.
</longdescription>
diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
index f70b8cce14b..530ee1c4fe7 100644
--- a/net-misc/libteam/metadata.xml
+++ b/net-misc/libteam/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>maintainer-needed</herd>
<use>
<flag name="zmq">Build witch <pkg>net-libs/zeromq</pkg> support</flag>
</use>
diff --git a/net-misc/linux-eoip/metadata.xml b/net-misc/linux-eoip/metadata.xml
index 41458c8e404..597c68880bb 100644
--- a/net-misc/linux-eoip/metadata.xml
+++ b/net-misc/linux-eoip/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<maintainer>
<email>nuclearcat@nuclearcat.com</email>
diff --git a/net-misc/livestreamer/metadata.xml b/net-misc/livestreamer/metadata.xml
index 0cfaa62977f..6e2d5a31369 100644
--- a/net-misc/livestreamer/metadata.xml
+++ b/net-misc/livestreamer/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>the.telvanni@gmail.com</email>
<name>Guillaume Lespinasse</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">chrippa/livestreamer</remote-id>
</upstream>
diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml
index 18b686c7ac5..7e21d5b7500 100644
--- a/net-misc/lksctp-tools/metadata.xml
+++ b/net-misc/lksctp-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>base-system</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
<description>
@@ -16,6 +15,10 @@
if it works
</description>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lksctp</remote-id>
</upstream>
diff --git a/net-misc/logmein-hamachi/metadata.xml b/net-misc/logmein-hamachi/metadata.xml
index c9fafa9c83d..08fd0be8e07 100644
--- a/net-misc/logmein-hamachi/metadata.xml
+++ b/net-misc/logmein-hamachi/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>nonno.cicala@libero.it</email>
<name>Simone Scanzoni</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/mdidentd/metadata.xml b/net-misc/mdidentd/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-misc/mdidentd/metadata.xml
+++ b/net-misc/mdidentd/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-irc</herd>
</pkgmetadata>
diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
index 10c0a3df9c9..336d2e78776 100644
--- a/net-misc/mediatomb/metadata.xml
+++ b/net-misc/mediatomb/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>video</herd>
<maintainer>
<email>thev00d00@gentoo.org</email>
<name>Ian Whyman</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
<flag name="flac">Enable FLAC metadata/artwork support</flag>
diff --git a/net-misc/mindterm/metadata.xml b/net-misc/mindterm/metadata.xml
index 838c00a4a44..6cb58e33adf 100644
--- a/net-misc/mindterm/metadata.xml
+++ b/net-misc/mindterm/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>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-misc/mobile-broadband-provider-info/metadata.xml
+++ b/net-misc/mobile-broadband-provider-info/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/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index c10566d5d9a..df4898fdec4 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/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="mbim">Enable MBIM modem protocol</flag>
<flag name="qmi">Enable support for the QMI modem protocol used by
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index 20177dc2b05..55e7202afeb 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/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>rainbow@irh.it</email>
<name>rainbow</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">nemesis</remote-id>
</upstream>
diff --git a/net-misc/netfleet/metadata.xml b/net-misc/netfleet/metadata.xml
index 426f5803788..814c9e0b8ed 100644
--- a/net-misc/netfleet/metadata.xml
+++ b/net-misc/netfleet/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">netfleet</remote-id>
</upstream>
diff --git a/net-misc/netkit-fingerd/metadata.xml b/net-misc/netkit-fingerd/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/netkit-fingerd/metadata.xml
+++ b/net-misc/netkit-fingerd/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/net-misc/netkit-rsh/metadata.xml b/net-misc/netkit-rsh/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/netkit-rsh/metadata.xml
+++ b/net-misc/netkit-rsh/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/net-misc/netkit-rwho/metadata.xml b/net-misc/netkit-rwho/metadata.xml
index 43ff7546736..fcdeee5abcc 100644
--- a/net-misc/netkit-rwho/metadata.xml
+++ b/net-misc/netkit-rwho/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/netpipes/metadata.xml b/net-misc/netpipes/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-misc/netpipes/metadata.xml
+++ b/net-misc/netpipes/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-misc/netstat-nat/metadata.xml
+++ b/net-misc/netstat-nat/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index e210f22ed96..0c22cbb8c00 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/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>gnome</herd>
- <maintainer>
+<maintainer>
<email>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index e210f22ed96..0c22cbb8c00 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/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>gnome</herd>
- <maintainer>
+<maintainer>
<email>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index e210f22ed96..0c22cbb8c00 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/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>gnome</herd>
- <maintainer>
+<maintainer>
<email>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index e210f22ed96..0c22cbb8c00 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/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>gnome</herd>
- <maintainer>
+<maintainer>
<email>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager-sstp/metadata.xml b/net-misc/networkmanager-sstp/metadata.xml
index 484deacc447..ffae8fa43aa 100644
--- a/net-misc/networkmanager-sstp/metadata.xml
+++ b/net-misc/networkmanager-sstp/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">sstp-client</remote-id>
</upstream>
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index e210f22ed96..0c22cbb8c00 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/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>gnome</herd>
- <maintainer>
+<maintainer>
<email>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index ed6d30f3711..25cc0483a0c 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/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="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index 185e561eac9..40d676929ec 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/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>mozilla</herd>
<maintainer>
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
@@ -10,6 +9,10 @@
<email>anarchy@gentoo.org</email>
<name>Jory A. Pratt</name>
</maintainer>
+ <maintainer>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+ </maintainer>
<upstream>
<remote-id type="bitbucket">mgorny/npapi-sdk</remote-id>
</upstream>
diff --git a/net-misc/ntp/metadata.xml b/net-misc/ntp/metadata.xml
index 50f686d2f43..cfa6d709ecf 100644
--- a/net-misc/ntp/metadata.xml
+++ b/net-misc/ntp/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>
NTP is a protocol designed to synchronize the clocks of computers over a network. NTP
version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
index 1255cb0c9dc..437701bff2c 100644
--- a/net-misc/nx/metadata.xml
+++ b/net-misc/nx/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>nx</herd>
+<maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+</maintainer>
<longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
</pkgmetadata>
diff --git a/net-misc/nxplayer/metadata.xml b/net-misc/nxplayer/metadata.xml
index 578fd5e7845..97ab237c609 100644
--- a/net-misc/nxplayer/metadata.xml
+++ b/net-misc/nxplayer/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>Enterprise Client is a free easy-to-use connection interface to allow quick access to your remote host where you have installed one of the NoMachine products. It's available for those who prefer just a standalone client application, rather than the NoMachine server/client app, either because regulatory requirements dictate that thin clients must install \“client-side\” software only, or simply because a scaled-down client app is your personal preference.</longdescription>
</pkgmetadata>
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index cfa796d8705..a2ffa4bfa99 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/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>henson@acm.org</email>
<name>Paul B. Henson</name>
@@ -10,6 +9,10 @@
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans (proxy)</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
OpenNTPD is a FREE, easy to use implementation of the Network Time
Protocol. It provides the ability to sync the local clock to remote
diff --git a/net-misc/openssh-blacklist/metadata.xml b/net-misc/openssh-blacklist/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/openssh-blacklist/metadata.xml
+++ b/net-misc/openssh-blacklist/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/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index ec8bad168c7..0997b8b0c5e 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
<maintainer restrict="net-misc/openssh[ldap]">
<email>robbat2@gentoo.org</email>
<description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<longdescription>
OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that
increasing numbers of people on the Internet are coming to rely on. Many users of telnet,
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index c346b732bbd..10706eb21d0 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -7,7 +7,10 @@
<maintainer>
<email>prometheanfire@gentoo.org</email>
</maintainer>
-<herd>virtualization</herd>
+<maintainer>
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+</maintainer>
<use>
<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
<flag name="pyside">Use <pkg>dev-python/pyside</pkg> instead of <pkg>dev-python/PyQt4</pkg> for Python/Qt-bindings when building with USE=monitor.</flag>
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index c5d8c73e53a..76fd4b106d4 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">packeth</remote-id>
</upstream>
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index 3fcf9314ee9..e3f4cbf2e44 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/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>pyxlcy@gmail.com</email>
<description>Please assign bugs</description>
@@ -10,6 +9,10 @@
<email>pacho@gentoo.org</email>
<description>proxy-maintainer, please CC on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
specified, pavuk will include features to stress test web sites using an
diff --git a/net-misc/pipes/metadata.xml b/net-misc/pipes/metadata.xml
index bd1cbeb8e1f..3db99ca629c 100644
--- a/net-misc/pipes/metadata.xml
+++ b/net-misc/pipes/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>
I just noticed that netpipes doesn't support bidirectional pipes.
So I made my own version.
diff --git a/net-misc/polly/metadata.xml b/net-misc/polly/metadata.xml
index 14d2eabbeac..a8fc0f18e75 100644
--- a/net-misc/polly/metadata.xml
+++ b/net-misc/polly/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>python</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">polly</remote-id>
</upstream>
diff --git a/net-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
index f493acd5865..dbd59a69c49 100644
--- a/net-misc/pps-tools/metadata.xml
+++ b/net-misc/pps-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>
<upstream>
<remote-id type="github">ago/pps-tools</remote-id>
</upstream>
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
index 2eadaf8a7e2..21205b28176 100644
--- a/net-misc/pssh/metadata.xml
+++ b/net-misc/pssh/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>
<upstream>
<remote-id type="google-code">parallel-ssh</remote-id>
</upstream>
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index d4d02bcdabb..511627363af 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/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>honza.breuer@gmail.com</email>
<name>Jan Breuer</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="debug">Enable debugging informations</flag>
<flag name="experimental">Enable experimental features</flag>
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
index d26da403607..1644d8bc757 100644
--- a/net-misc/pycnb/metadata.xml
+++ b/net-misc/pycnb/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>python</herd>
<maintainer>
<email>yac@gentoo.org</email>
<name>Jan Matejka</name>
</maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
index 424f8b70442..5db29427ae6 100644
--- a/net-misc/pyhoca-cli/metadata.xml
+++ b/net-misc/pyhoca-cli/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>
PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go.
</longdescription>
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
index 1edb00b503c..99ff893038d 100644
--- a/net-misc/pyhoca-gui/metadata.xml
+++ b/net-misc/pyhoca-gui/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>
PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.).
diff --git a/net-misc/pymazon/metadata.xml b/net-misc/pymazon/metadata.xml
index 4f200ad3b95..8299a763f40 100644
--- a/net-misc/pymazon/metadata.xml
+++ b/net-misc/pymazon/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">pymazon</remote-id>
</upstream>
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
index 710937bd9d5..e102151ca03 100644
--- a/net-misc/python-x2go/metadata.xml
+++ b/net-misc/python-x2go/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>
The Python X2Go module integrates X2Go client support into your python programmes.
Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui"
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index a796a4ea0f0..a13dd5b71d1 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/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>qt</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">catkin</remote-id>
</upstream>
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 175f3d5aa56..8d880fd9bc0 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/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>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="git">Enable git (version control system) support</flag>
</use>
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index c6694bd40de..27bc871d0b7 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/metadata.xml
@@ -9,7 +9,10 @@
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
-<herd>proxy-maintainers</herd>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index ffdcb3d23eb..f040f077789 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/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 Hhoran</name>
<description>Proxy maintainer, to be assigned all bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 0ae013fa5f9..d98da4ca574 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/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:samba:rsync</remote-id>
</upstream>
diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml
index 49d68040ba4..0ea1a5e7e8c 100644
--- a/net-misc/rygel/metadata.xml
+++ b/net-misc/rygel/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="tracker">Install dependencies for the tracker plugin</flag>
<flag name="transcode">Install dependencies for transcoding support</flag>
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 06966dc83fc..0b579e115a6 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/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>igor@itesten.com</email>
<name>Igor Testen</name>
@@ -11,6 +10,10 @@
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Command line client for Amazon S3.
</longdescription>
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index d2670aeb5e5..94e4603ee75 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -6,7 +6,10 @@
<name>Vladimir Pavljuchenkov</name>
<description>Primary maintainer.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
This small program receives UDP datagrams on a given port, and resends
those datagrams to a specified set of receivers. In addition, a
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index fa93e6debbf..669cdaf8641 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/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>brendan@horan.hk</email>
<name>Brendan Horan</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ser2net</remote-id>
</upstream>
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/net-misc/shout/metadata.xml
+++ b/net-misc/shout/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index 06dbd3e5c3f..e7f31aa4c75 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/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>
+<maintainer>
<email>rogerx.oss@gmail.com</email>
<name>Roger Zauner</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
index 36ddf567af2..c2ed54a2a79 100644
--- a/net-misc/slimrat/metadata.xml
+++ b/net-misc/slimrat/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>premek@vohnout.cz</email>
<name>Premysl Vohnout</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="X">Install also GUI client</flag>
</use>
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index 353711a0c96..38c1ed990ce 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">smb4k</remote-id>
<bugs-to>http://sourceforge.net/p/smb4k/tickets/</bugs-to>
diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml
index b5da052d476..7c8b361af68 100644
--- a/net-misc/smbc/metadata.xml
+++ b/net-misc/smbc/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>samba</herd>
+ <maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
<longdescription>
Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters.
</longdescription>
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 97267d74c9e..9179818046c 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-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>virtualization</herd>
<maintainer>
<email>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
+ <maintainer>
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
<use>
<flag name="dbus">Support for desktop integration such as
automounting and other APIs exposed by your DE via D-Bus</flag>
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
index 9724727cb6f..050bd1b807b 100644
--- a/net-misc/ssh-askpass-fullscreen/metadata.xml
+++ b/net-misc/ssh-askpass-fullscreen/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">atj/ssh-askpass-fullscreen</remote-id>
</upstream>
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 2461dd9ed7e..a800ed4d470 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
@@ -12,6 +11,10 @@
<name> Jing, Cheng</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sshpass</remote-id>
</upstream>
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 9beed9d39f8..095c1238fa8 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -14,6 +13,10 @@
<email>m.j.everitt@iee.org</email>
<name>Michael Everitt</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sstp-client</remote-id>
</upstream>
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 4c2255b2076..7d74383db7b 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -6,7 +6,10 @@
<name>Vladimir Pavljuchenkov</name>
<description>Primary maintainer.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Stargazer is a powerful (inter)net billing system, capable of gathering
traffic statistics from many sources (such as NetFlow protocol,
diff --git a/net-misc/streamtuner/metadata.xml b/net-misc/streamtuner/metadata.xml
index 1c466c63d01..4c1a11aec65 100644
--- a/net-misc/streamtuner/metadata.xml
+++ b/net-misc/streamtuner/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="shout">Enable shoutcast plug-in.</flag>
<flag name="xiph">Enable xiph.org plug-in.</flag>
diff --git a/net-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml
index 82aa620760f..f27e339c1a1 100644
--- a/net-misc/suite3270/metadata.xml
+++ b/net-misc/suite3270/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>s390</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
@@ -13,6 +11,14 @@
<name>Jesse Farinacci</name>
<description>Maintainer by proxy, please CC on all bugs.</description>
</maintainer>
+ <maintainer>
+ <email>s390@gentoo.org</email>
+ <name>Gentoo Linux s390 Development</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">x3270</remote-id>
</upstream>
diff --git a/net-misc/switzerland/metadata.xml b/net-misc/switzerland/metadata.xml
index f1752c72738..292b664e96b 100644
--- a/net-misc/switzerland/metadata.xml
+++ b/net-misc/switzerland/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
Switzerland is an open source software tool for testing the integrity of
data communications over networks, ISPs and firewalls. It will spot IP
diff --git a/net-misc/sx/metadata.xml b/net-misc/sx/metadata.xml
index 32f6c93e6b3..fdfe57eae11 100644
--- a/net-misc/sx/metadata.xml
+++ b/net-misc/sx/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>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
SX Cluster is a reliable, fully distributed cluster solution for your data storage needs, released under the GPL licence. With SX Cluster you aggregate the disk space available on multiple servers and merge it into a single storage system. The cluster makes sure that your data is always replicated over multiple nodes (the exact number of copies is defined by the sysadmin) and synchronized. Additionally Sx has built-in support for deduplication, client-side encryption, on-the-fly compression and much more.
</longdescription>
diff --git a/net-misc/tcpsound/metadata.xml b/net-misc/tcpsound/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-misc/tcpsound/metadata.xml
+++ b/net-misc/tcpsound/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 6a53856dc86..5d86d8b1d20 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/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>wine</herd>
<maintainer>
<email>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
@@ -10,6 +9,10 @@
<email>np-hardass@gentoo.org</email>
<name>NP-Hardass</name>
</maintainer>
+ <maintainer>
+ <email>wine@gentoo.org</email>
+ <name>Wine</name>
+ </maintainer>
<use>
<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled wine.</flag>
</use>
diff --git a/net-misc/termpkg/metadata.xml b/net-misc/termpkg/metadata.xml
index 08ef7eeecbe..9d87a337e62 100644
--- a/net-misc/termpkg/metadata.xml
+++ b/net-misc/termpkg/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
<longdescription lang="en">
Termpkg is a terminal server daemon and simple telnet like client.
Allows access to one or more serial ports through the telnet protocol.
diff --git a/net-misc/tipcutils/metadata.xml b/net-misc/tipcutils/metadata.xml
index 951d1882040..455557fd570 100644
--- a/net-misc/tipcutils/metadata.xml
+++ b/net-misc/tipcutils/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>tokiclover@gmail.com</email>
<description>Maintainer. Assign bugs on him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">tipc</remote-id>
</upstream>
diff --git a/net-misc/ucarp/metadata.xml b/net-misc/ucarp/metadata.xml
index 348e6c4de81..77e2a9a7903 100644
--- a/net-misc/ucarp/metadata.xml
+++ b/net-misc/ucarp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cluster</herd>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/udpcast/metadata.xml b/net-misc/udpcast/metadata.xml
index 526d84b8a3c..c9f4f45b0ff 100644
--- a/net-misc/udpcast/metadata.xml
+++ b/net-misc/udpcast/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>
UDPcast is a file transfer tool that can send data simultaneously to
many destinations on a LAN. This can for instance be used to install
diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
index e172f68d226..99c97ccbb58 100644
--- a/net-misc/uftp/metadata.xml
+++ b/net-misc/uftp/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>azamat.hackimov@gmail.com</email>
<name>Azamat Hackimov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
<flag name="server">Install uftp server daemon</flag>
</use>
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 2193d772e35..3409127f534 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
index 712c2d256e0..4accf104ff6 100644
--- a/net-misc/vconfig/metadata.xml
+++ b/net-misc/vconfig/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<longdescription>
The vconfig program allows you to create and remove vlan-devices on a
vlan enabled kernel. Vlan-devices are virtual ethernet devices which
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index ac0f4c2e671..697602ceb3b 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/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>nvinson234@gmail.com</email>
<name>Nicholas Vinson</name>
@@ -14,6 +13,10 @@
<email>jmbsvicetto@gentoo.org</email>
<name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="pcap">
Enable the pcap-based plugin that allows creating a switch against
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 4708913096e..2c40f6eaa45 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/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="rdp">Enable access to Windows RDP protocol using
<pkg>net-misc/rdesktop</pkg></flag>
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index f140c75c3b9..99046455826 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/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="telepathy">Enable desktop sharing through a telepathy client</flag>
</use>
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 32f93b3b34c..d2b6883844b 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/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>lorand.jakab@schweiz.ch</email>
<name>Lorand Jakab</name>
@@ -10,6 +9,10 @@
<email>mmokrejs@gmail.com</email>
<name>Martin Mokrejs</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
</use>
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 87ab6aa0aaa..2cbd7327046 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/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="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
<flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-misc/whois/metadata.xml
+++ b/net-misc/whois/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/net-misc/x2goclient/metadata.xml b/net-misc/x2goclient/metadata.xml
index f009de1b9d2..81a9d86b61e 100644
--- a/net-misc/x2goclient/metadata.xml
+++ b/net-misc/x2goclient/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>The X2Go Qt client</longdescription>
</pkgmetadata>
diff --git a/net-misc/x2goserver/metadata.xml b/net-misc/x2goserver/metadata.xml
index b85de2f29ab..2ded1c5d193 100644
--- a/net-misc/x2goserver/metadata.xml
+++ b/net-misc/x2goserver/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>nx</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
<longdescription>The X2Go server</longdescription>
<use>
<flag name="fuse">Use <pkg>sys-fs/sshfs-fuse</pkg> to allow shared folders</flag>
diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml
index 9ef9c615e0c..f06fb162636 100644
--- a/net-misc/yandex-disk/metadata.xml
+++ b/net-misc/yandex-disk/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>blueboar@gentoo.org</email>
<name>Vladimir Romanov</name>
@@ -12,4 +11,8 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/ytalk/metadata.xml b/net-misc/ytalk/metadata.xml
index a2cb70369f0..bdc1b75aa8a 100644
--- a/net-misc/ytalk/metadata.xml
+++ b/net-misc/ytalk/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>keso@impul.se</email>
<name>Andreas King</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>