15 files changed, 12 insertions, 17 deletions
diff --git a/net-nntp/brag/metadata.xml b/net-nntp/brag/metadata.xml
index a1e90794ffc0..e5d76ef8166a 100644
--- a/net-nntp/brag/metadata.xml
+++ b/net-nntp/brag/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-news</herd>
   <upstream>
     <remote-id type="sourceforge">brag</remote-id>
   </upstream>
diff --git a/net-nntp/hellanzb/metadata.xml b/net-nntp/hellanzb/metadata.xml
index f91da9dc28aa..21e6fceb2634 100644
--- a/net-nntp/hellanzb/metadata.xml
+++ b/net-nntp/hellanzb/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-news</herd>
 	<maintainer>
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
diff --git a/net-nntp/inn/metadata.xml b/net-nntp/inn/metadata.xml
index 9b3ffff95280..0aa3ca880592 100644
--- a/net-nntp/inn/metadata.xml
+++ b/net-nntp/inn/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-news</herd>
 <use>
 	<flag name="innkeywords">Enable automatic keyword generation support</flag>
 	<flag name="inntaggedhash">Use tagged hash table for history (disables large
diff --git a/net-nntp/kwooty/metadata.xml b/net-nntp/kwooty/metadata.xml
index b741437bc16a..036780115854 100644
--- a/net-nntp/kwooty/metadata.xml
+++ b/net-nntp/kwooty/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>net-news</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kwooty</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=285032</bugs-to>
diff --git a/net-nntp/leafnode/metadata.xml b/net-nntp/leafnode/metadata.xml
index a1f1b73219d4..7375f2d0d5d0 100644
--- a/net-nntp/leafnode/metadata.xml
+++ b/net-nntp/leafnode/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-news</herd>
 	<upstream>
 		<remote-id type="sourceforge">leafnode</remote-id>
 	</upstream>
diff --git a/net-nntp/newspost/metadata.xml b/net-nntp/newspost/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/newspost/metadata.xml
+++ b/net-nntp/newspost/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-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/nzb/metadata.xml b/net-nntp/nzb/metadata.xml
index 3344595f6cf7..5844158829cb 100644
--- a/net-nntp/nzb/metadata.xml
+++ b/net-nntp/nzb/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<herd>net-news</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nzb</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=113793</bugs-to>
diff --git a/net-nntp/nzbget/metadata.xml b/net-nntp/nzbget/metadata.xml
index 22a02f229788..7bc61c2a256e 100644
--- a/net-nntp/nzbget/metadata.xml
+++ b/net-nntp/nzbget/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-news</herd>
 	<maintainer>
 		<email>swegener@gentoo.org</email>
 		<name>Sven Wegener</name>
diff --git a/net-nntp/pan/metadata.xml b/net-nntp/pan/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-nntp/pan/metadata.xml
+++ b/net-nntp/pan/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-nntp/slrn/metadata.xml b/net-nntp/slrn/metadata.xml
index 72b6f505360d..20f31fc54a25 100644
--- a/net-nntp/slrn/metadata.xml
+++ b/net-nntp/slrn/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-news</herd>
 	<use>
 		<flag name="uudeview">Add support for yEnc coding and more using
 		<pkg>dev-libs/uulib</pkg></flag>
diff --git a/net-nntp/slrnconf/metadata.xml b/net-nntp/slrnconf/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/slrnconf/metadata.xml
+++ b/net-nntp/slrnconf/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-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/sn/metadata.xml b/net-nntp/sn/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/sn/metadata.xml
+++ b/net-nntp/sn/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-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/suck/metadata.xml b/net-nntp/suck/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/suck/metadata.xml
+++ b/net-nntp/suck/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-news</herd>
 </pkgmetadata>
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 34720248271c..18e5f2897a18 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/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-news</herd>
 <use>
 <flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
 <flag name="evil">Let tin generate a message ID</flag>
diff --git a/net-nntp/xrn/metadata.xml b/net-nntp/xrn/metadata.xml
index 4d0ebe73a55f..097975e3adc2 100644
--- a/net-nntp/xrn/metadata.xml
+++ b/net-nntp/xrn/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-news</herd>
 </pkgmetadata>