summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/alpine/metadata.xml5
-rw-r--r--mail-client/balsa/metadata.xml5
-rw-r--r--mail-client/biabam/metadata.xml5
-rw-r--r--mail-client/claws-mail-acpi-notifier/metadata.xml5
-rw-r--r--mail-client/claws-mail-address_keeper/metadata.xml5
-rw-r--r--mail-client/claws-mail-archive/metadata.xml5
-rw-r--r--mail-client/claws-mail-att-remover/metadata.xml5
-rw-r--r--mail-client/claws-mail-attachwarner/metadata.xml5
-rw-r--r--mail-client/claws-mail-clamd/metadata.xml5
-rw-r--r--mail-client/claws-mail-fancy/metadata.xml5
-rw-r--r--mail-client/claws-mail-fetchinfo/metadata.xml5
-rw-r--r--mail-client/claws-mail-gdata/metadata.xml5
-rw-r--r--mail-client/claws-mail-gtkhtml/metadata.xml5
-rw-r--r--mail-client/claws-mail-mailmbox/metadata.xml5
-rw-r--r--mail-client/claws-mail-newmail/metadata.xml5
-rw-r--r--mail-client/claws-mail-notification/metadata.xml5
-rw-r--r--mail-client/claws-mail-pdf-viewer/metadata.xml5
-rw-r--r--mail-client/claws-mail-perl/metadata.xml5
-rw-r--r--mail-client/claws-mail-python/metadata.xml5
-rw-r--r--mail-client/claws-mail-rssyl/metadata.xml5
-rw-r--r--mail-client/claws-mail-spam-report/metadata.xml5
-rw-r--r--mail-client/claws-mail-tnef-parse/metadata.xml5
-rw-r--r--mail-client/claws-mail-vcalendar/metadata.xml5
-rw-r--r--mail-client/claws-mail/metadata.xml5
-rw-r--r--mail-client/clawsker/metadata.xml5
-rw-r--r--mail-client/cone/metadata.xml5
-rw-r--r--mail-client/drac/metadata.xml5
-rw-r--r--mail-client/etpan-ng/metadata.xml5
-rw-r--r--mail-client/evolution/metadata.xml5
-rw-r--r--mail-client/geary/metadata.xml5
-rw-r--r--mail-client/hap/metadata.xml5
-rw-r--r--mail-client/mailx-support/metadata.xml5
-rw-r--r--mail-client/mailx/metadata.xml5
-rw-r--r--mail-client/mutt/metadata.xml5
-rw-r--r--mail-client/nail/metadata.xml5
-rw-r--r--mail-client/nmh/metadata.xml5
-rw-r--r--mail-client/pinepgp/metadata.xml5
-rw-r--r--mail-client/roundcube/metadata.xml5
-rw-r--r--mail-client/squirrelmail/metadata.xml5
-rw-r--r--mail-client/sylpheed/metadata.xml5
-rw-r--r--mail-client/thunderbird-bin/metadata.xml5
-rw-r--r--mail-client/thunderbird/metadata.xml5
-rw-r--r--mail-client/trojita/metadata.xml10
43 files changed, 176 insertions, 44 deletions
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 554dd62b44eb..0d93de4485da 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/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="chappa">enhance alpine by applying Eduardo Chappa's
patches</flag>
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 8406e551eb55..07639f88151d 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/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="crypt">Adds support for GnuPG encryption</flag>
<flag name="gtkhtml">Use gtkhtml for HTML rendering</flag>
diff --git a/mail-client/biabam/metadata.xml b/mail-client/biabam/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/biabam/metadata.xml
+++ b/mail-client/biabam/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-acpi-notifier/metadata.xml b/mail-client/claws-mail-acpi-notifier/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-acpi-notifier/metadata.xml
+++ b/mail-client/claws-mail-acpi-notifier/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-address_keeper/metadata.xml b/mail-client/claws-mail-address_keeper/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-address_keeper/metadata.xml
+++ b/mail-client/claws-mail-address_keeper/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-archive/metadata.xml b/mail-client/claws-mail-archive/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-archive/metadata.xml
+++ b/mail-client/claws-mail-archive/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-att-remover/metadata.xml b/mail-client/claws-mail-att-remover/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-att-remover/metadata.xml
+++ b/mail-client/claws-mail-att-remover/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-attachwarner/metadata.xml b/mail-client/claws-mail-attachwarner/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-attachwarner/metadata.xml
+++ b/mail-client/claws-mail-attachwarner/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-clamd/metadata.xml b/mail-client/claws-mail-clamd/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-clamd/metadata.xml
+++ b/mail-client/claws-mail-clamd/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-fancy/metadata.xml b/mail-client/claws-mail-fancy/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-fancy/metadata.xml
+++ b/mail-client/claws-mail-fancy/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-fetchinfo/metadata.xml b/mail-client/claws-mail-fetchinfo/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-fetchinfo/metadata.xml
+++ b/mail-client/claws-mail-fetchinfo/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-gdata/metadata.xml b/mail-client/claws-mail-gdata/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-gdata/metadata.xml
+++ b/mail-client/claws-mail-gdata/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-gtkhtml/metadata.xml b/mail-client/claws-mail-gtkhtml/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-gtkhtml/metadata.xml
+++ b/mail-client/claws-mail-gtkhtml/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-mailmbox/metadata.xml b/mail-client/claws-mail-mailmbox/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-mailmbox/metadata.xml
+++ b/mail-client/claws-mail-mailmbox/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-newmail/metadata.xml b/mail-client/claws-mail-newmail/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-newmail/metadata.xml
+++ b/mail-client/claws-mail-newmail/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-notification/metadata.xml b/mail-client/claws-mail-notification/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-notification/metadata.xml
+++ b/mail-client/claws-mail-notification/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-pdf-viewer/metadata.xml b/mail-client/claws-mail-pdf-viewer/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-pdf-viewer/metadata.xml
+++ b/mail-client/claws-mail-pdf-viewer/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-perl/metadata.xml b/mail-client/claws-mail-perl/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-perl/metadata.xml
+++ b/mail-client/claws-mail-perl/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-python/metadata.xml b/mail-client/claws-mail-python/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-python/metadata.xml
+++ b/mail-client/claws-mail-python/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-rssyl/metadata.xml b/mail-client/claws-mail-rssyl/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-rssyl/metadata.xml
+++ b/mail-client/claws-mail-rssyl/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-spam-report/metadata.xml b/mail-client/claws-mail-spam-report/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-spam-report/metadata.xml
+++ b/mail-client/claws-mail-spam-report/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-tnef-parse/metadata.xml b/mail-client/claws-mail-tnef-parse/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-tnef-parse/metadata.xml
+++ b/mail-client/claws-mail-tnef-parse/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail-vcalendar/metadata.xml b/mail-client/claws-mail-vcalendar/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/claws-mail-vcalendar/metadata.xml
+++ b/mail-client/claws-mail-vcalendar/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index a129ca79ec50..ad8d0b941dae 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/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>net-mail</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="archive">Enable archiving plugin</flag>
<flag name="gdata">Enable plugin for access to Google
diff --git a/mail-client/clawsker/metadata.xml b/mail-client/clawsker/metadata.xml
index df7c388592e4..f8fd21e35aea 100644
--- a/mail-client/clawsker/metadata.xml
+++ b/mail-client/clawsker/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/cone/metadata.xml b/mail-client/cone/metadata.xml
index 5c974e7d457b..fb89de715acf 100644
--- a/mail-client/cone/metadata.xml
+++ b/mail-client/cone/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>
<upstream>
<remote-id type="sourceforge">courier</remote-id>
</upstream>
diff --git a/mail-client/drac/metadata.xml b/mail-client/drac/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/drac/metadata.xml
+++ b/mail-client/drac/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/etpan-ng/metadata.xml b/mail-client/etpan-ng/metadata.xml
index b2f66f193014..3b4532ab48f4 100644
--- a/mail-client/etpan-ng/metadata.xml
+++ b/mail-client/etpan-ng/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>
<longdescription>etPan is a console mail client that is based on libEtPan!</longdescription>
<upstream>
<remote-id type="sourceforge">libetpan</remote-id>
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index cfd0a3170188..170bead645a4 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/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="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
<flag name="crypt">Enable GPG encryption support using
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/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/mail-client/hap/metadata.xml b/mail-client/hap/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/hap/metadata.xml
+++ b/mail-client/hap/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/mailx-support/metadata.xml
+++ b/mail-client/mailx-support/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/mailx/metadata.xml b/mail-client/mailx/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/mailx/metadata.xml
+++ b/mail-client/mailx/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 435dba8c3546..66f737e73413 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/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>net-mail</herd>
<maintainer>
<email>grobian@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
<flag name="pop">Enable support for pop</flag>
diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
index cec2552c7b96..c23949faad70 100644
--- a/mail-client/nail/metadata.xml
+++ b/mail-client/nail/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="net">
Enable support for network protocols (POP, IMAP and SMTP). If you
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
index 7c09058dd0c2..0c62e021c340 100644
--- a/mail-client/nmh/metadata.xml
+++ b/mail-client/nmh/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>in-gentoo@baka.org</email>
<name>Seth Robertson</name>
<description>Maintainer</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/mail-client/pinepgp/metadata.xml b/mail-client/pinepgp/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/mail-client/pinepgp/metadata.xml
+++ b/mail-client/pinepgp/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>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index 4cb349a08b2c..70bb300d9e28 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/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>web-apps</herd>
<maintainer>
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">roundcubemail</remote-id>
</upstream>
diff --git a/mail-client/squirrelmail/metadata.xml b/mail-client/squirrelmail/metadata.xml
index 7d41afda0934..1e4ec650952d 100644
--- a/mail-client/squirrelmail/metadata.xml
+++ b/mail-client/squirrelmail/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="filter">Enable <pkg>mail-filter/amavisd-new</pkg>
filtering</flag>
diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
index a619498bd13f..3983b2191213 100644
--- a/mail-client/sylpheed/metadata.xml
+++ b/mail-client/sylpheed/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>net-mail</herd>
<maintainer>
<email>hattya@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
</use>
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
index 898de1be8c0f..207b5666e86a 100644
--- a/mail-client/thunderbird-bin/metadata.xml
+++ b/mail-client/thunderbird-bin/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>mozilla</herd>
+<maintainer>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+</maintainer>
<use>
<flag name="crashreporter">Enable crash reporter for bugs</flag>
</use>
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 3121466c40e3..db5aad8606d9 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/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>mozilla</herd>
+<maintainer>
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+</maintainer>
<use>
<flag name="bindist">Disable official Thunderbird branding (icons, name) which
are not binary-redistributable according to upstream.</flag>
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 4f9aa6a88e76..aa11543869cc 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>kde</herd>
<maintainer>
<email>jkt@gentoo.org</email>
<name>Jan Kundrát</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
</use>