summaryrefslogtreecommitdiff
path: root/net-im
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-im
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-im')
-rw-r--r--net-im/ayttm/metadata.xml1
-rw-r--r--net-im/choqok/metadata.xml5
-rw-r--r--net-im/climm/metadata.xml1
-rw-r--r--net-im/corebird/metadata.xml6
-rw-r--r--net-im/cpop/metadata.xml1
-rw-r--r--net-im/ejabberd/metadata.xml1
-rw-r--r--net-im/empathy/metadata.xml5
-rw-r--r--net-im/gajim/metadata.xml1
-rw-r--r--net-im/gg-transport/metadata.xml1
-rw-r--r--net-im/indicator-messages/metadata.xml1
-rw-r--r--net-im/jabber-base/metadata.xml1
-rw-r--r--net-im/jabberd2/metadata.xml1
-rw-r--r--net-im/kadu/metadata.xml1
-rw-r--r--net-im/kde-telepathy-meta/metadata.xml5
-rw-r--r--net-im/kouchat/metadata.xml5
-rw-r--r--net-im/ktp-accounts-kcm/metadata.xml5
-rw-r--r--net-im/ktp-approver/metadata.xml5
-rw-r--r--net-im/ktp-auth-handler/metadata.xml5
-rw-r--r--net-im/ktp-call-ui/metadata.xml5
-rw-r--r--net-im/ktp-common-internals/metadata.xml5
-rw-r--r--net-im/ktp-contact-list/metadata.xml5
-rw-r--r--net-im/ktp-contact-runner/metadata.xml5
-rw-r--r--net-im/ktp-desktop-applets/metadata.xml5
-rw-r--r--net-im/ktp-filetransfer-handler/metadata.xml5
-rw-r--r--net-im/ktp-kded-module/metadata.xml5
-rw-r--r--net-im/ktp-send-file/metadata.xml5
-rw-r--r--net-im/ktp-text-ui/metadata.xml5
-rw-r--r--net-im/licq/metadata.xml1
-rw-r--r--net-im/mcabber/metadata.xml1
-rw-r--r--net-im/mu-conference/metadata.xml1
-rw-r--r--net-im/openfire/metadata.xml1
-rw-r--r--net-im/pidgin/metadata.xml1
-rw-r--r--net-im/psi/metadata.xml6
-rw-r--r--net-im/psimedia/metadata.xml6
-rw-r--r--net-im/pyaim-t/metadata.xml6
-rw-r--r--net-im/pyicq-t/metadata.xml1
-rw-r--r--net-im/qtwitter/metadata.xml5
-rw-r--r--net-im/qutim/metadata.xml5
-rw-r--r--net-im/qwit/metadata.xml5
-rw-r--r--net-im/reaim/metadata.xml1
-rw-r--r--net-im/sendxmpp/metadata.xml1
-rw-r--r--net-im/silc-server/metadata.xml1
-rw-r--r--net-im/silc-toolkit/metadata.xml1
-rw-r--r--net-im/simpserver-bin/metadata.xml1
-rw-r--r--net-im/telepathy-connection-managers/metadata.xml5
-rw-r--r--net-im/telepathy-logger/metadata.xml5
-rw-r--r--net-im/telepathy-mission-control/metadata.xml6
-rw-r--r--net-im/tkabber/metadata.xml1
-rw-r--r--net-im/turses/metadata.xml5
-rw-r--r--net-im/vacuum/metadata.xml5
-rw-r--r--net-im/ysm/metadata.xml1
51 files changed, 112 insertions, 56 deletions
diff --git a/net-im/ayttm/metadata.xml b/net-im/ayttm/metadata.xml
index 06a0a876dac..0b0ad744b92 100644
--- a/net-im/ayttm/metadata.xml
+++ b/net-im/ayttm/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-im</herd>
<longdescription lang="en">
Ayttm is a multi-protocol instant messaging client with some novel features
such as the ability to connect to livejournal.com and the ability to send
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index 4ccecd71210..7ae140f88e4 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/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>
<use>
<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
</use>
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
index c5c9e3a791c..a31ca5c08c2 100644
--- a/net-im/climm/metadata.xml
+++ b/net-im/climm/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-im</herd>
<use>
<flag name="otr">Enable encrypted conversations</flag>
</use>
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
index 14d619e0d0f..b38ab95f642 100644
--- a/net-im/corebird/metadata.xml
+++ b/net-im/corebird/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-im</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>thatslyude@gmail.com</email>
<name>Chandler Paul</name>
@@ -13,6 +11,10 @@
<name>Mark R. Pariente</name>
<description>Maintainer, Assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="glade">Install glade catalogs for corebird</flag>
</use>
diff --git a/net-im/cpop/metadata.xml b/net-im/cpop/metadata.xml
index 3e2b4181f5b..097975e3adc 100644
--- a/net-im/cpop/metadata.xml
+++ b/net-im/cpop/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-im</herd>
</pkgmetadata>
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 3385d266e58..942a3f912ea 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/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-im</herd>
<maintainer>
<email>aidecoe@gentoo.org</email>
<name>Amadeusz Żołnowski</name>
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 0968098fd22..a790c53baed 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/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="geoloc">Enable geolocation support through
<pkg>app-misc/geoclue</pkg></flag>
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 657c12dda75..9b8efcc7cc3 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/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-im</herd>
<maintainer>
<email>aidecoe@gentoo.org</email>
</maintainer>
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
index e30841e388b..d27955a45a0 100644
--- a/net-im/gg-transport/metadata.xml
+++ b/net-im/gg-transport/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-im</herd>
<longdescription>
Gadu-Gadu is a IM network vary famous in Poland, this package will
enable your jabber server to talk to that network.
diff --git a/net-im/indicator-messages/metadata.xml b/net-im/indicator-messages/metadata.xml
index 86195656b0c..4fa3e1e97bd 100644
--- a/net-im/indicator-messages/metadata.xml
+++ b/net-im/indicator-messages/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>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 3c4008ea782..c217899aa69 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/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-im</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
</maintainer>
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
index ec73f0b6647..7720eaf315b 100644
--- a/net-im/jabberd2/metadata.xml
+++ b/net-im/jabberd2/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-im</herd>
<use>
<flag name="experimental">Enable experimental features such
as TLS Everywhere.</flag>
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
index d54eca9f9ee..f2226a08d88 100644
--- a/net-im/kadu/metadata.xml
+++ b/net-im/kadu/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-im</herd>
<maintainer>
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
diff --git a/net-im/kde-telepathy-meta/metadata.xml b/net-im/kde-telepathy-meta/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/kde-telepathy-meta/metadata.xml
+++ b/net-im/kde-telepathy-meta/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-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
index 01c7bbf2f46..8c511ae02e8 100644
--- a/net-im/kouchat/metadata.xml
+++ b/net-im/kouchat/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>
<upstream>
<remote-id type="google-code">kouchat</remote-id>
</upstream>
diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
index c5ae96e2c63..d713f1228a6 100644
--- a/net-im/ktp-accounts-kcm/metadata.xml
+++ b/net-im/ktp-accounts-kcm/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>
<use>
<flag name="modemmanager">Enable support for mobile broadband devices</flag>
</use>
diff --git a/net-im/ktp-approver/metadata.xml b/net-im/ktp-approver/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-approver/metadata.xml
+++ b/net-im/ktp-approver/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-im/ktp-auth-handler/metadata.xml b/net-im/ktp-auth-handler/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-auth-handler/metadata.xml
+++ b/net-im/ktp-auth-handler/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-im/ktp-call-ui/metadata.xml b/net-im/ktp-call-ui/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-im/ktp-call-ui/metadata.xml
+++ b/net-im/ktp-call-ui/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-im/ktp-common-internals/metadata.xml b/net-im/ktp-common-internals/metadata.xml
index 0defe784bf0..4e969fb63de 100644
--- a/net-im/ktp-common-internals/metadata.xml
+++ b/net-im/ktp-common-internals/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>
<use>
<flag name="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
</use>
diff --git a/net-im/ktp-contact-list/metadata.xml b/net-im/ktp-contact-list/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-contact-list/metadata.xml
+++ b/net-im/ktp-contact-list/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-im/ktp-contact-runner/metadata.xml b/net-im/ktp-contact-runner/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-contact-runner/metadata.xml
+++ b/net-im/ktp-contact-runner/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-im/ktp-desktop-applets/metadata.xml b/net-im/ktp-desktop-applets/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-desktop-applets/metadata.xml
+++ b/net-im/ktp-desktop-applets/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-im/ktp-filetransfer-handler/metadata.xml b/net-im/ktp-filetransfer-handler/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-filetransfer-handler/metadata.xml
+++ b/net-im/ktp-filetransfer-handler/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-im/ktp-kded-module/metadata.xml b/net-im/ktp-kded-module/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-kded-module/metadata.xml
+++ b/net-im/ktp-kded-module/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-im/ktp-send-file/metadata.xml b/net-im/ktp-send-file/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-im/ktp-send-file/metadata.xml
+++ b/net-im/ktp-send-file/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-im/ktp-text-ui/metadata.xml b/net-im/ktp-text-ui/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-im/ktp-text-ui/metadata.xml
+++ b/net-im/ktp-text-ui/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-im/licq/metadata.xml b/net-im/licq/metadata.xml
index ab808db3af1..bae7d06ed9d 100644
--- a/net-im/licq/metadata.xml
+++ b/net-im/licq/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-im</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index ce8c1aca6ff..b0c5c3fc4d9 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/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-im</herd>
<maintainer>
<email>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
index 2b8a7eb7312..72b6f83d600 100644
--- a/net-im/mu-conference/metadata.xml
+++ b/net-im/mu-conference/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-im</herd>
<longdescription>Multi User Conference for Jabber</longdescription>
</pkgmetadata>
diff --git a/net-im/openfire/metadata.xml b/net-im/openfire/metadata.xml
index 7776b9877bd..794b2e52a6e 100644
--- a/net-im/openfire/metadata.xml
+++ b/net-im/openfire/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-im</herd>
<maintainer>
<email>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 7a986a0958f..b0f4d31ea1a 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/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-im</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index a21f6d01e5a..be0ed83fae2 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-im</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>Psi is a very good jabber client that uses QT</longdescription>
<use>
<flag name="enchant">Use enchant spell engine instead of aspell</flag>
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index 55991f084ee..c42ba290931 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-im</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
<flag name="demo">build simple test application for the PsiMedia system</flag>
</use>
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
index 28d9e8bf392..2a8bc6a3d6f 100644
--- a/net-im/pyaim-t/metadata.xml
+++ b/net-im/pyaim-t/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-im</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>volkris@gmail.com</email>
<name>Chris Carlin</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>Python based jabber transport for AIM</longdescription>
<use>
<flag name="webinterface">Install dependencies needed for the web
diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml
index 2ff2b66a1c2..3284adcd2d1 100644
--- a/net-im/pyicq-t/metadata.xml
+++ b/net-im/pyicq-t/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-im</herd>
<longdescription>Python based jabber transport for ICQ</longdescription>
<use>
<flag name="webinterface">Install dependencies needed for the web
diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
index 3cbebd85b7e..75d755d0806 100644
--- a/net-im/qtwitter/metadata.xml
+++ b/net-im/qtwitter/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-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 8862591a628..a4890858396 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/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>fatzer2@gmail.com</email>
<name>Alexander Golubev</name>
<description>Proxied maintainer. Assign bugs on him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<maintainer>
<email>euroelessar@yandex.ru</email>
diff --git a/net-im/qwit/metadata.xml b/net-im/qwit/metadata.xml
index e848af84bf6..a96972b82e0 100644
--- a/net-im/qwit/metadata.xml
+++ b/net-im/qwit/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>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-im/reaim/metadata.xml b/net-im/reaim/metadata.xml
index 0a0826c95a7..019e4be8514 100644
--- a/net-im/reaim/metadata.xml
+++ b/net-im/reaim/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-im</herd>
<upstream>
<remote-id type="sourceforge">reaim</remote-id>
</upstream>
diff --git a/net-im/sendxmpp/metadata.xml b/net-im/sendxmpp/metadata.xml
index b0475f13df4..40a822ede84 100644
--- a/net-im/sendxmpp/metadata.xml
+++ b/net-im/sendxmpp/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-im</herd>
<upstream>
<remote-id type="github">lhost/sendxmpp</remote-id>
</upstream>
diff --git a/net-im/silc-server/metadata.xml b/net-im/silc-server/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-im/silc-server/metadata.xml
+++ b/net-im/silc-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-im/silc-toolkit/metadata.xml b/net-im/silc-toolkit/metadata.xml
index 6ef15e900f1..097975e3adc 100644
--- a/net-im/silc-toolkit/metadata.xml
+++ b/net-im/silc-toolkit/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-im/simpserver-bin/metadata.xml b/net-im/simpserver-bin/metadata.xml
index 2db006f2a47..4e924e4cd1b 100644
--- a/net-im/simpserver-bin/metadata.xml
+++ b/net-im/simpserver-bin/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-im</herd>
<longdescription>
SimpServer is the first lightweight instant messaging security gateway for Unix systems. Install SimpServer on a
Unix system and configure IM clients on your local network, and conversations with Simp-equipped parties will be
diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
index ce896eba1cd..3ef0484a274 100644
--- a/net-im/telepathy-connection-managers/metadata.xml
+++ b/net-im/telepathy-connection-managers/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="gadu">Enable Gadu Gadu protocol support.</flag>
<flag name="irc">Enable Internet Relay Chat (IRC) support.</flag>
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-im/telepathy-logger/metadata.xml
+++ b/net-im/telepathy-logger/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-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
index 5265d716d02..7db1ad48cc1 100644
--- a/net-im/telepathy-mission-control/metadata.xml
+++ b/net-im/telepathy-mission-control/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>gnome</herd>
-<herd>net-im</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription>Mission Control, or MC, is a telepathy component providing a
way for "end-user" applications to abstract some of the details of connection
managers, to provide a simple way to manipulate a bunch of connection managers
diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
index c5f8c720a12..45aa09c0092 100644
--- a/net-im/tkabber/metadata.xml
+++ b/net-im/tkabber/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-im</herd>
<longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
<use>
<flag name="plugins">Enables installation the extra plugins</flag>
diff --git a/net-im/turses/metadata.xml b/net-im/turses/metadata.xml
index b97b0d9a7e1..39694d0c08f 100644
--- a/net-im/turses/metadata.xml
+++ b/net-im/turses/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-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 4d1898eb416..04ee9fd6515 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/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>nikoli@gmx.us</email>
<name>Nikoli</name>
@@ -10,6 +9,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="adiummessagestyle">Use UI styles created for Adium</flag>
<flag name="annotations">Enable adding comments to the contacts in the roster</flag>
diff --git a/net-im/ysm/metadata.xml b/net-im/ysm/metadata.xml
index 0afcecc3c60..58e3d15e097 100644
--- a/net-im/ysm/metadata.xml
+++ b/net-im/ysm/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-im</herd>
<upstream>
<remote-id type="sourceforge">ysmv7</remote-id>
</upstream>