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.

51 files changed, 38 insertions, 53 deletions

diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 3b02d59255ab..d76a5add977b 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/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>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
diff --git a/net-dialup/capi4k-utils/metadata.xml b/net-dialup/capi4k-utils/metadata.xml
index 3ba465ebbbb5..90e058c4cd71 100644
--- a/net-dialup/capi4k-utils/metadata.xml
+++ b/net-dialup/capi4k-utils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-dialup</herd>
 	<longdescription lang="en">
 		This package contains the CAPI 2.0 library, which is needed for all
 		CAPI applications. It also contains programs to show information about
diff --git a/net-dialup/capidivert/metadata.xml b/net-dialup/capidivert/metadata.xml
index b61d2af8a9f9..b2117327ab91 100644
--- a/net-dialup/capidivert/metadata.xml
+++ b/net-dialup/capidivert/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">
 		CAPI based utility to control ISDN diversion facilities.
 	</longdescription>
diff --git a/net-dialup/capifwd/metadata.xml b/net-dialup/capifwd/metadata.xml
index dac0bf21fe8b..99f7a0315399 100644
--- a/net-dialup/capifwd/metadata.xml
+++ b/net-dialup/capifwd/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 daemon forwarding CAPI messages to capi20proxy clients</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">capi20proxy</remote-id>
diff --git a/net-dialup/capisuite/metadata.xml b/net-dialup/capisuite/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/capisuite/metadata.xml
+++ b/net-dialup/capisuite/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/cistronradius/metadata.xml b/net-dialup/cistronradius/metadata.xml
index 1930bc3c4e14..a6f04503b543 100644
--- a/net-dialup/cistronradius/metadata.xml
+++ b/net-dialup/cistronradius/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>
 An authentication and accounting server for terminal servers that speak the RADIUS protocol.
 </longdescription>
diff --git a/net-dialup/cutecom/metadata.xml b/net-dialup/cutecom/metadata.xml
index e386f7f66dea..932b0241145a 100644
--- a/net-dialup/cutecom/metadata.xml
+++ b/net-dialup/cutecom/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>CuteCom is a graphical serial terminal, like minicom. It is aimed mainly at hardware 
 developers or other people who need a terminal to talk to their devices.</longdescription>
   <upstream>
diff --git a/net-dialup/dial/metadata.xml b/net-dialup/dial/metadata.xml
index deda48640109..1a95b1b7f224 100644
--- a/net-dialup/dial/metadata.xml
+++ b/net-dialup/dial/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>
 	<upstream>
 		<remote-id type="sourceforge">dwun</remote-id>
 	</upstream>
diff --git a/net-dialup/diald/metadata.xml b/net-dialup/diald/metadata.xml
index 8569d812c705..8c857f73cfe0 100644
--- a/net-dialup/diald/metadata.xml
+++ b/net-dialup/diald/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>Diald is an intelligent link management tool originally named 
 for its ability to control dial-on-demand network connections</longdescription>
 	<upstream>
diff --git a/net-dialup/drdsl/metadata.xml b/net-dialup/drdsl/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/drdsl/metadata.xml
+++ b/net-dialup/drdsl/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/dtrace/metadata.xml b/net-dialup/dtrace/metadata.xml
index 3017626ca0de..1bd2a86dd0e9 100644
--- a/net-dialup/dtrace/metadata.xml
+++ b/net-dialup/dtrace/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>sbriesen@gentoo.org</email>
 		<name>Stefan Briesenick</name>
diff --git a/net-dialup/dwun/metadata.xml b/net-dialup/dwun/metadata.xml
index deda48640109..1a95b1b7f224 100644
--- a/net-dialup/dwun/metadata.xml
+++ b/net-dialup/dwun/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>
 	<upstream>
 		<remote-id type="sourceforge">dwun</remote-id>
 	</upstream>
diff --git a/net-dialup/fbgetty/metadata.xml b/net-dialup/fbgetty/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/fbgetty/metadata.xml
+++ b/net-dialup/fbgetty/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/fcpci/metadata.xml b/net-dialup/fcpci/metadata.xml
index 756ddd4a6227..097975e3adc2 100644
--- a/net-dialup/fcpci/metadata.xml
+++ b/net-dialup/fcpci/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml
index 946cd15bd2fb..3a6e115cf7d4 100644
--- a/net-dialup/freeradius-client/metadata.xml
+++ b/net-dialup/freeradius-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>net-dialup</herd>
 <longdescription>FreeRADIUS Client is a framework and library for writing
 RADIUS Clients which additionally includes radlogin, a flexible RADIUS
 aware login replacement, a command line program to send RADIUS accounting
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 74768f5bba42..2023991859a8 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/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>
   <use>
     <flag name="pcap">
       Build the RADIUS sniffer which requires <pkg>net-libs/libpcap</pkg>.
diff --git a/net-dialup/globespan-adsl/metadata.xml b/net-dialup/globespan-adsl/metadata.xml
index 58a624c08f76..136ea918c73d 100644
--- a/net-dialup/globespan-adsl/metadata.xml
+++ b/net-dialup/globespan-adsl/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>ADSL modem driver for Globespan/ECI chipsets.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/gnuradius/metadata.xml b/net-dialup/gnuradius/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/gnuradius/metadata.xml
+++ b/net-dialup/gnuradius/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/gtkterm/metadata.xml b/net-dialup/gtkterm/metadata.xml
index cd1e3d75e802..035775ca661f 100644
--- a/net-dialup/gtkterm/metadata.xml
+++ b/net-dialup/gtkterm/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>A simplified "clone" of the famous Hyperterminal, without support for X/Y/ZMODEM protocols.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/hcfpcimodem/metadata.xml b/net-dialup/hcfpcimodem/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/hcfpcimodem/metadata.xml
+++ b/net-dialup/hcfpcimodem/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/isdn-firmware/metadata.xml b/net-dialup/isdn-firmware/metadata.xml
index e86609b3d54e..39c1074e573a 100644
--- a/net-dialup/isdn-firmware/metadata.xml
+++ b/net-dialup/isdn-firmware/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">
 		ISDN firmware for active ISDN cards (AVM, Eicon, etc.)
 	</longdescription>
diff --git a/net-dialup/itund/metadata.xml b/net-dialup/itund/metadata.xml
index 80845ef05e9b..de784432d731 100644
--- a/net-dialup/itund/metadata.xml
+++ b/net-dialup/itund/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">
 		ItunD (ISDN tunnel Daemon) provides a network tunnel over ISDN lines
 		using the CAPI interface. The ISDN4Linux isdn-net (rawIP) devices are
diff --git a/net-dialup/kpnadsl4linux/metadata.xml b/net-dialup/kpnadsl4linux/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/kpnadsl4linux/metadata.xml
+++ b/net-dialup/kpnadsl4linux/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/linux-atm/metadata.xml b/net-dialup/linux-atm/metadata.xml
index cf1b28ef7a1c..34c656785725 100644
--- a/net-dialup/linux-atm/metadata.xml
+++ b/net-dialup/linux-atm/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>Tools for ATM.</longdescription>
   <upstream>
     <remote-id type="sourceforge">linux-atm</remote-id>
diff --git a/net-dialup/lrzsz/metadata.xml b/net-dialup/lrzsz/metadata.xml
index f7407264c3ae..ed062eb346c5 100644
--- a/net-dialup/lrzsz/metadata.xml
+++ b/net-dialup/lrzsz/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>embedded</herd>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 <longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/martian-modem/metadata.xml b/net-dialup/martian-modem/metadata.xml
index bb68c349bea5..8d04438f1c20 100644
--- a/net-dialup/martian-modem/metadata.xml
+++ b/net-dialup/martian-modem/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>rogerx.oss@gmail.com</email>
 	<name>Roger</name>
@@ -11,4 +10,8 @@
 	<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>
 </pkgmetadata>
diff --git a/net-dialup/mgetty/metadata.xml b/net-dialup/mgetty/metadata.xml
index a8ca9754ea94..f60bc07b2f7d 100644
--- a/net-dialup/mgetty/metadata.xml
+++ b/net-dialup/mgetty/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>Suite of programs that allows you to take full advantage of your voice/fax modem.
 mgetty is capable of handling data, fax and voice calls without interfering with outgoing calls.</longdescription>
 <use>
diff --git a/net-dialup/mingetty/metadata.xml b/net-dialup/mingetty/metadata.xml
index 3141de561c6b..1277c957c719 100644
--- a/net-dialup/mingetty/metadata.xml
+++ b/net-dialup/mingetty/metadata.xml
@@ -5,7 +5,10 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<longdescription>The mingetty program is a lightweight, minimalist getty program for
 use only on virtual consoles.  Mingetty is not suitable for serial
 lines (you should use the mgetty program in that case).</longdescription>
diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index a27512af0be1..7f7b481c9b23 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/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 lang="en">
     Minicom is a menu driven communications program. It emulates ANSI and VT102
     terminals. It has a dialing directory and auto zmodem download.
diff --git a/net-dialup/moserial/metadata.xml b/net-dialup/moserial/metadata.xml
index 8b49a280b79f..a704edd765e3 100644
--- a/net-dialup/moserial/metadata.xml
+++ b/net-dialup/moserial/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
 	<email>steev@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 	moserial is a clean, friendly gtk-based serial terminal for the gnome desktop.
 </longdescription>
diff --git a/net-dialup/mwavem/metadata.xml b/net-dialup/mwavem/metadata.xml
index acee6b7963aa..d4bfd701fc57 100644
--- a/net-dialup/mwavem/metadata.xml
+++ b/net-dialup/mwavem/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>User level application for IBM Mwave modem.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/picocom/metadata.xml b/net-dialup/picocom/metadata.xml
index 26e742e2c906..3ea253d988b8 100644
--- a/net-dialup/picocom/metadata.xml
+++ b/net-dialup/picocom/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>embedded</herd>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">picocom</remote-id>
 		<remote-id type="github">npat-efault/picocom</remote-id>
diff --git a/net-dialup/ppp-scripts/metadata.xml b/net-dialup/ppp-scripts/metadata.xml
index 756ddd4a6227..097975e3adc2 100644
--- a/net-dialup/ppp-scripts/metadata.xml
+++ b/net-dialup/ppp-scripts/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index f7d263a32a14..8ba686495209 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -5,7 +5,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <herd>base-system</herd>
+  <maintainer>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>ppp (Paul's PPP Package) is an open source package which
   implements the Point-to-Point Protocol</longdescription>
   <use>
diff --git a/net-dialup/pppconfig/metadata.xml b/net-dialup/pppconfig/metadata.xml
index 1e11e7bbd01b..097975e3adc2 100644
--- a/net-dialup/pppconfig/metadata.xml
+++ b/net-dialup/pppconfig/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-dialup</herd>
 </pkgmetadata>
diff --git a/net-dialup/pptpclient/metadata.xml b/net-dialup/pptpclient/metadata.xml
index 65fb9b5c3f7d..572fbcb6d5bc 100644
--- a/net-dialup/pptpclient/metadata.xml
+++ b/net-dialup/pptpclient/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>PPTP Client is a client for the proprietary Microsoft Point-to-Point Tunneling Protocol.</longdescription>
   <upstream>
     <remote-id type="sourceforge">pptpclient</remote-id>
diff --git a/net-dialup/pptpd/metadata.xml b/net-dialup/pptpd/metadata.xml
index c068ca384f2c..02edb56766da 100644
--- a/net-dialup/pptpd/metadata.xml
+++ b/net-dialup/pptpd/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>
 	<use>
 		<flag name="gre-extreme-debug">Log all GRE accepted packages when in debug
 		mode (required if you want upstream support)</flag>
diff --git a/net-dialup/qtwvdialer/metadata.xml b/net-dialup/qtwvdialer/metadata.xml
index 9bd11a373d66..df0ab6316378 100644
--- a/net-dialup/qtwvdialer/metadata.xml
+++ b/net-dialup/qtwvdialer/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>
 	<upstream>
 		<remote-id type="github">schuay/qt4wvdialer</remote-id>
 	</upstream>
diff --git a/net-dialup/radiusclient-ng/metadata.xml b/net-dialup/radiusclient-ng/metadata.xml
index fe3761bbc565..372d3853f95c 100644
--- a/net-dialup/radiusclient-ng/metadata.xml
+++ b/net-dialup/radiusclient-ng/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>Purpose of this project is to build portable, easy-to-use and standard compliant library suitable for 
 developing free and commercial software that need support for a RADIUS protocol (RFCs 2128 and 2139).</longdescription>
 	<upstream>
diff --git a/net-dialup/radiusclient/metadata.xml b/net-dialup/radiusclient/metadata.xml
index 3f6ad1322e7d..ca9494d88a6e 100644
--- a/net-dialup/radiusclient/metadata.xml
+++ b/net-dialup/radiusclient/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 library for writing RADIUS clients accompanied with several client utilities</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">radiusclient</remote-id>
diff --git a/net-dialup/rp-l2tp/metadata.xml b/net-dialup/rp-l2tp/metadata.xml
index 72249d8a629e..3e7845d0f20c 100644
--- a/net-dialup/rp-l2tp/metadata.xml
+++ b/net-dialup/rp-l2tp/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>
 	<upstream>
 		<remote-id type="sourceforge">rp-l2tp</remote-id>
 	</upstream>
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml
index a1edcfe784b9..b49e34221998 100644
--- a/net-dialup/rp-pppoe/metadata.xml
+++ b/net-dialup/rp-pppoe/metadata.xml
@@ -5,5 +5,8 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<herd>base-system</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-dialup/sendpage/metadata.xml b/net-dialup/sendpage/metadata.xml
index f444241a55dc..adbc3bfdc4aa 100644
--- a/net-dialup/sendpage/metadata.xml
+++ b/net-dialup/sendpage/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>To send alphanumeric pages to a pager, if an email gateway is unavailable or undesirable, 
 software is needed to control a modem which will dial a "Paging Central", and deliver the pages using 
 an ASCII delivery system known as "TAP".
diff --git a/net-dialup/sercd/metadata.xml b/net-dialup/sercd/metadata.xml
index 7a12fc3fa390..3825da4b6642 100644
--- a/net-dialup/sercd/metadata.xml
+++ b/net-dialup/sercd/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>sercd is an RFC 2217-compliant serial port redirector.
 It lets you share a serial port through network.</longdescription>
 	<upstream>
diff --git a/net-dialup/speedtouch-usb/metadata.xml b/net-dialup/speedtouch-usb/metadata.xml
index ad9105084891..576f7d890bf3 100644
--- a/net-dialup/speedtouch-usb/metadata.xml
+++ b/net-dialup/speedtouch-usb/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
 <longdescription>Firmware and configuration instructions for the kernel-space driver for Alcatel SpeedTouch USB modems.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/tkvoice/metadata.xml b/net-dialup/tkvoice/metadata.xml
index 539a4f382a29..52a22256d53e 100644
--- a/net-dialup/tkvoice/metadata.xml
+++ b/net-dialup/tkvoice/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>Tk-Voice is a Telephone Answering Machine frontend for vgetty
 and also a Facsimile Answering Machine frontend for mgetty.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/ueagle-atm/metadata.xml b/net-dialup/ueagle-atm/metadata.xml
index 14b1904fbd1b..a0b90a1a5bd6 100644
--- a/net-dialup/ueagle-atm/metadata.xml
+++ b/net-dialup/ueagle-atm/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>Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver
 available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/ueagle4-atm/metadata.xml b/net-dialup/ueagle4-atm/metadata.xml
index 917ca85d66e6..2e36d3cedb0a 100644
--- a/net-dialup/ueagle4-atm/metadata.xml
+++ b/net-dialup/ueagle4-atm/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>Firmware and configuration instructions for Eagle USB E4 ADSL Modem driver
 available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/wvdial/metadata.xml b/net-dialup/wvdial/metadata.xml
index ed5cc4c7268c..59099d9e51d8 100644
--- a/net-dialup/wvdial/metadata.xml
+++ b/net-dialup/wvdial/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>
 	<upstream>
 		<remote-id type="google-code">wvstreams</remote-id>
 	</upstream>
diff --git a/net-dialup/xc/metadata.xml b/net-dialup/xc/metadata.xml
index c9337563bbfb..4aee52939942 100644
--- a/net-dialup/xc/metadata.xml
+++ b/net-dialup/xc/metadata.xml
@@ -5,5 +5,8 @@
 		<email>kumba@gentoo.org</email>
 		<name>Joshua Kinard</name>
 	</maintainer>
-	<herd>embedded</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 0c7e5f5bfb42..8dff0042d1ad 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/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>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>