summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/anope/metadata.xml1
-rw-r--r--net-irc/asuka/metadata.xml1
-rw-r--r--net-irc/atheme-services/metadata.xml1
-rw-r--r--net-irc/bnc/metadata.xml1
-rw-r--r--net-irc/bobotpp/metadata.xml1
-rw-r--r--net-irc/cgiirc/metadata.xml5
-rw-r--r--net-irc/charybdis/metadata.xml1
-rw-r--r--net-irc/dccserver/metadata.xml1
-rw-r--r--net-irc/dircproxy/metadata.xml1
-rw-r--r--net-irc/eggdrop/metadata.xml1
-rw-r--r--net-irc/emech/metadata.xml1
-rw-r--r--net-irc/epic4/metadata.xml1
-rw-r--r--net-irc/epic5/metadata.xml1
-rw-r--r--net-irc/ii/metadata.xml1
-rw-r--r--net-irc/iip/metadata.xml1
-rw-r--r--net-irc/inspircd/metadata.xml5
-rw-r--r--net-irc/irc-client/metadata.xml1
-rw-r--r--net-irc/irc-server/metadata.xml1
-rw-r--r--net-irc/ircii/metadata.xml1
-rw-r--r--net-irc/ircmap/metadata.xml1
-rw-r--r--net-irc/ircservices/metadata.xml1
-rw-r--r--net-irc/ircstats/metadata.xml1
-rw-r--r--net-irc/irssi-otr/metadata.xml1
-rw-r--r--net-irc/irssi/metadata.xml1
-rw-r--r--net-irc/irssistats/metadata.xml1
-rw-r--r--net-irc/jircii/metadata.xml1
-rw-r--r--net-irc/konversation/metadata.xml6
-rw-r--r--net-irc/kvirc/metadata.xml5
-rw-r--r--net-irc/loqui/metadata.xml1
-rw-r--r--net-irc/miau/metadata.xml1
-rw-r--r--net-irc/muh/metadata.xml1
-rw-r--r--net-irc/nebula/metadata.xml1
-rw-r--r--net-irc/ngircd/metadata.xml8
-rw-r--r--net-irc/ninja/metadata.xml1
-rw-r--r--net-irc/onis/metadata.xml1
-rw-r--r--net-irc/pisg/metadata.xml1
-rw-r--r--net-irc/polari/metadata.xml5
-rw-r--r--net-irc/psybnc/metadata.xml1
-rw-r--r--net-irc/ptlink-ircd/metadata.xml1
-rw-r--r--net-irc/ptlink-opm/metadata.xml1
-rw-r--r--net-irc/quassel/metadata.xml6
-rw-r--r--net-irc/rbot/metadata.xml1
-rw-r--r--net-irc/redirbot/metadata.xml5
-rw-r--r--net-irc/rhapsody/metadata.xml1
-rw-r--r--net-irc/savirc/metadata.xml1
-rw-r--r--net-irc/scrollz/metadata.xml1
-rw-r--r--net-irc/shadowircd/metadata.xml1
-rw-r--r--net-irc/sic/metadata.xml1
-rw-r--r--net-irc/smuxi/metadata.xml5
-rw-r--r--net-irc/srvx/metadata.xml1
-rw-r--r--net-irc/telepathy-idle/metadata.xml6
-rw-r--r--net-irc/ultimate/metadata.xml1
-rw-r--r--net-irc/unrealircd/metadata.xml1
-rw-r--r--net-irc/weechat/metadata.xml1
-rw-r--r--net-irc/xaric/metadata.xml1
-rw-r--r--net-irc/znc/metadata.xml1
56 files changed, 41 insertions, 61 deletions
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index e180509b7d6..24dce491de5 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/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-irc</herd>
<maintainer>
<email>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/asuka/metadata.xml b/net-irc/asuka/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/asuka/metadata.xml
+++ b/net-irc/asuka/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-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml
index eefa09b1766..4eae51178a7 100644
--- a/net-irc/atheme-services/metadata.xml
+++ b/net-irc/atheme-services/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-irc</herd>
<maintainer>
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
diff --git a/net-irc/bnc/metadata.xml b/net-irc/bnc/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/bnc/metadata.xml
+++ b/net-irc/bnc/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-irc/bobotpp/metadata.xml b/net-irc/bobotpp/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/bobotpp/metadata.xml
+++ b/net-irc/bobotpp/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-irc/cgiirc/metadata.xml b/net-irc/cgiirc/metadata.xml
index 6632069b5af..0496fdd3267 100644
--- a/net-irc/cgiirc/metadata.xml
+++ b/net-irc/cgiirc/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-irc/charybdis/metadata.xml b/net-irc/charybdis/metadata.xml
index 4740cb09d29..cdf9343797d 100644
--- a/net-irc/charybdis/metadata.xml
+++ b/net-irc/charybdis/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-irc</herd>
<maintainer>
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
diff --git a/net-irc/dccserver/metadata.xml b/net-irc/dccserver/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/dccserver/metadata.xml
+++ b/net-irc/dccserver/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-irc/dircproxy/metadata.xml b/net-irc/dircproxy/metadata.xml
index 69b57b0d2b4..5bc45a698af 100644
--- a/net-irc/dircproxy/metadata.xml
+++ b/net-irc/dircproxy/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-irc</herd>
<upstream>
<remote-id type="google-code">dircproxy</remote-id>
</upstream>
diff --git a/net-irc/eggdrop/metadata.xml b/net-irc/eggdrop/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/eggdrop/metadata.xml
+++ b/net-irc/eggdrop/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-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/emech/metadata.xml
+++ b/net-irc/emech/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-irc/epic4/metadata.xml b/net-irc/epic4/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/epic4/metadata.xml
+++ b/net-irc/epic4/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-irc/epic5/metadata.xml b/net-irc/epic5/metadata.xml
index 5e6a8dbf6cd..b83ace5c61e 100644
--- a/net-irc/epic5/metadata.xml
+++ b/net-irc/epic5/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-irc</herd>
<use>
<flag name="archive">Use <pkg>app-arch/libarchive</pkg> to use zip and tar archives from scripts.</flag>
<flag name="valgrind">Compile against <pkg>dev-util/valgrind</pkg> headers to improve memory-leak checking when running epic5 under valgrind.</flag>
diff --git a/net-irc/ii/metadata.xml b/net-irc/ii/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ii/metadata.xml
+++ b/net-irc/ii/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-irc/iip/metadata.xml b/net-irc/iip/metadata.xml
index 7e25b929ec9..ea1faeee064 100644
--- a/net-irc/iip/metadata.xml
+++ b/net-irc/iip/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-irc</herd>
<upstream>
<remote-id type="sourceforge">invisibleip</remote-id>
</upstream>
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 29578589c51..04e4959bfab 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>awilfox.gentoo@foxkit.us</email>
<name>Andrew Wilcox</name>
<description>Proxy (user) maintainer, bugs to be assigned to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
for Linux, BSD, Windows and Mac OS X systems which was created from
diff --git a/net-irc/irc-client/metadata.xml b/net-irc/irc-client/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/irc-client/metadata.xml
+++ b/net-irc/irc-client/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-irc/irc-server/metadata.xml b/net-irc/irc-server/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/irc-server/metadata.xml
+++ b/net-irc/irc-server/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-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ircii/metadata.xml
+++ b/net-irc/ircii/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-irc/ircmap/metadata.xml b/net-irc/ircmap/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ircmap/metadata.xml
+++ b/net-irc/ircmap/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-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
index 715b3c1f806..8636ca0aaac 100644
--- a/net-irc/ircservices/metadata.xml
+++ b/net-irc/ircservices/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-irc</herd>
<maintainer>
<email>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/ircstats/metadata.xml b/net-irc/ircstats/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ircstats/metadata.xml
+++ b/net-irc/ircstats/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-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml
index 52dfe678b74..33e88432484 100644
--- a/net-irc/irssi-otr/metadata.xml
+++ b/net-irc/irssi-otr/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-irc</herd>
<upstream>
<remote-id type="github">cryptodotis/irssi-otr</remote-id>
</upstream>
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index e014acd79a6..ba972c8ce61 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/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-irc</herd>
<maintainer>
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
diff --git a/net-irc/irssistats/metadata.xml b/net-irc/irssistats/metadata.xml
index 2993f5a3bd7..5d1c08fe1ca 100644
--- a/net-irc/irssistats/metadata.xml
+++ b/net-irc/irssistats/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-irc</herd>
<maintainer>
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
diff --git a/net-irc/jircii/metadata.xml b/net-irc/jircii/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/jircii/metadata.xml
+++ b/net-irc/jircii/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-irc/konversation/metadata.xml b/net-irc/konversation/metadata.xml
index 96dedda219e..f38d43267b1 100644
--- a/net-irc/konversation/metadata.xml
+++ b/net-irc/konversation/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-irc</herd>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 8c436c20b9b..26f6db57b42 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,7 +5,10 @@
<email>arfrever.fta@gmail.com</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="dcc_video">Support video connections over DCC protocol</flag>
<flag name="dcc_voice">Support voice connections over DCC protocol</flag>
diff --git a/net-irc/loqui/metadata.xml b/net-irc/loqui/metadata.xml
index e3b6a0abed4..4a78c9f36f0 100644
--- a/net-irc/loqui/metadata.xml
+++ b/net-irc/loqui/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-irc</herd>
<upstream>
<remote-id type="launchpad">loqui</remote-id>
</upstream>
diff --git a/net-irc/miau/metadata.xml b/net-irc/miau/metadata.xml
index 15b5f1e060e..5cf7911309a 100644
--- a/net-irc/miau/metadata.xml
+++ b/net-irc/miau/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-irc</herd>
<upstream>
<remote-id type="sourceforge">miau</remote-id>
</upstream>
diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml
index f0844b37b1d..853d464e8d4 100644
--- a/net-irc/muh/metadata.xml
+++ b/net-irc/muh/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-irc</herd>
<longdescription>
Persistent IRC bouncer.
</longdescription>
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
index 9af2cb65c5f..525ebe5d9ae 100644
--- a/net-irc/nebula/metadata.xml
+++ b/net-irc/nebula/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-irc</herd>
<longdescription>
Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
The goals are
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index 9f4b1679abe..bd1a2e70ab8 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-irc</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
+<maintainer>
<email>gentoo@blackphoenix.de</email>
<name>Moritz Kick</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
</use>
diff --git a/net-irc/ninja/metadata.xml b/net-irc/ninja/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ninja/metadata.xml
+++ b/net-irc/ninja/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-irc/onis/metadata.xml b/net-irc/onis/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/onis/metadata.xml
+++ b/net-irc/onis/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-irc/pisg/metadata.xml b/net-irc/pisg/metadata.xml
index a41ad8725cb..95c74acfc8b 100644
--- a/net-irc/pisg/metadata.xml
+++ b/net-irc/pisg/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-irc</herd>
<upstream>
<remote-id type="sourceforge">pisg</remote-id>
</upstream>
diff --git a/net-irc/polari/metadata.xml b/net-irc/polari/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-irc/polari/metadata.xml
+++ b/net-irc/polari/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-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index 5a33ac00109..1a67e638bb6 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/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-irc</herd>
<maintainer>
<email>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
diff --git a/net-irc/ptlink-ircd/metadata.xml b/net-irc/ptlink-ircd/metadata.xml
index c519652bdf0..097975e3adc 100644
--- a/net-irc/ptlink-ircd/metadata.xml
+++ b/net-irc/ptlink-ircd/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-irc/ptlink-opm/metadata.xml b/net-irc/ptlink-opm/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/ptlink-opm/metadata.xml
+++ b/net-irc/ptlink-opm/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-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 6155014a8b2..d85723e7540 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/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>net-irc</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>patrick@gentoo.org</email>
</maintainer>
@@ -14,6 +12,10 @@
<email>sputnick@quassel-irc.org</email>
<description>Upstream author, please CC on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="monolithic">
Build Standalone client with integrated core, no external
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index 5ea626901d5..4e71c2d5a32 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/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-irc</herd>
<maintainer>
<email>a3li@gentoo.org</email>
<name>Alex Legler</name>
diff --git a/net-irc/redirbot/metadata.xml b/net-irc/redirbot/metadata.xml
index 96e82ef3a39..b656d3d3390 100644
--- a/net-irc/redirbot/metadata.xml
+++ b/net-irc/redirbot/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>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-irc/rhapsody/metadata.xml b/net-irc/rhapsody/metadata.xml
index 832ac05e1ab..c7aef678169 100644
--- a/net-irc/rhapsody/metadata.xml
+++ b/net-irc/rhapsody/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-irc</herd>
<upstream>
<remote-id type="sourceforge">rhapsody</remote-id>
</upstream>
diff --git a/net-irc/savirc/metadata.xml b/net-irc/savirc/metadata.xml
index c519652bdf0..097975e3adc 100644
--- a/net-irc/savirc/metadata.xml
+++ b/net-irc/savirc/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-irc/scrollz/metadata.xml b/net-irc/scrollz/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/scrollz/metadata.xml
+++ b/net-irc/scrollz/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-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
index 764b9b8e6bb..73cc90933f3 100644
--- a/net-irc/shadowircd/metadata.xml
+++ b/net-irc/shadowircd/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-irc</herd>
<maintainer>
<email>jdhore@gentoo.org</email>
<name>Jeff Horelick</name>
diff --git a/net-irc/sic/metadata.xml b/net-irc/sic/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-irc/sic/metadata.xml
+++ b/net-irc/sic/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-irc/smuxi/metadata.xml b/net-irc/smuxi/metadata.xml
index e01adbb307d..e372675ec78 100644
--- a/net-irc/smuxi/metadata.xml
+++ b/net-irc/smuxi/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>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-irc/srvx/metadata.xml b/net-irc/srvx/metadata.xml
index be2f9156854..a26863d4229 100644
--- a/net-irc/srvx/metadata.xml
+++ b/net-irc/srvx/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-irc</herd>
<use>
<flag name="bahamut">Choose bahamut protocol over p10 protocol</flag>
</use>
diff --git a/net-irc/telepathy-idle/metadata.xml b/net-irc/telepathy-idle/metadata.xml
index 8185e919f20..dc4f7afb790 100644
--- a/net-irc/telepathy-idle/metadata.xml
+++ b/net-irc/telepathy-idle/metadata.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>net-im</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>Telepathy connection manager featuring IRC protocol.</longdescription>
</pkgmetadata>
diff --git a/net-irc/ultimate/metadata.xml b/net-irc/ultimate/metadata.xml
index 580b3be35c1..9f57b917c34 100644
--- a/net-irc/ultimate/metadata.xml
+++ b/net-irc/ultimate/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-irc</herd>
<maintainer>
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 255310e51a5..27d55d87d7b 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/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-irc</herd>
<maintainer>
<email>binki@gentoo.org</email>
<name>Nathan Phillip Brink</name>
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 8fc4a83c3ea..b2cb7b63d1a 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/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-irc</herd>
<maintainer>
<email>radhermit@gentoo.org</email>
</maintainer>
diff --git a/net-irc/xaric/metadata.xml b/net-irc/xaric/metadata.xml
index c519652bdf0..097975e3adc 100644
--- a/net-irc/xaric/metadata.xml
+++ b/net-irc/xaric/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-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index b37157dfe4d..bb18a488b92 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/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-irc</herd>
<maintainer>
<email>wired@gentoo.org</email>
<name>Alex Alexander</name>