diff --git a/acct-group/cockpit-ws/metadata.xml b/acct-group/cockpit-ws/metadata.xml
index eea561c55..7a38bb900 100644
--- a/acct-group/cockpit-ws/metadata.xml
+++ b/acct-group/cockpit-ws/metadata.xml
@@ -1,12 +1,5 @@
-
- hurikhan77+bgo@gmail.com
- Kai Krakow
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
diff --git a/acct-user/cockpit-ws/metadata.xml b/acct-user/cockpit-ws/metadata.xml
index eea561c55..7a38bb900 100644
--- a/acct-user/cockpit-ws/metadata.xml
+++ b/acct-user/cockpit-ws/metadata.xml
@@ -1,12 +1,5 @@
-
- hurikhan77+bgo@gmail.com
- Kai Krakow
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
diff --git a/app-crypt/etoken-sac/metadata.xml b/app-crypt/etoken-sac/metadata.xml
index 23da526b2..c332c141b 100644
--- a/app-crypt/etoken-sac/metadata.xml
+++ b/app-crypt/etoken-sac/metadata.xml
@@ -1,14 +1,8 @@
-
- mva@mva.name
-
- If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
-
- Vadim A. Misbakh-Soloviov
-
-FIXME
-
+
+ FIXME
+
diff --git a/app-dicts/stardict-wyabdcrealpeopletts/metadata.xml b/app-dicts/stardict-wyabdcrealpeopletts/metadata.xml
index 0b019b0e7..7a38bb900 100644
--- a/app-dicts/stardict-wyabdcrealpeopletts/metadata.xml
+++ b/app-dicts/stardict-wyabdcrealpeopletts/metadata.xml
@@ -1,5 +1,5 @@
-mantainer-wanted
+
diff --git a/app-emulation/winetricks-zh/metadata.xml b/app-emulation/winetricks-zh/metadata.xml
index 424fb745f..7af28e4a9 100644
--- a/app-emulation/winetricks-zh/metadata.xml
+++ b/app-emulation/winetricks-zh/metadata.xml
@@ -1,20 +1,7 @@
-
- Chiitoo@gentoo.org
- Jimi Huotari
- Proxied maintainer; assign all bugs to him
-
-
- NP-Hardass@gentoo.org
- NP-Hardass
- Proxy maintainer; CC on all bugs
-
-
- wine@gentoo.org
- Wine
-
+
winetricks
Winetricks/winetricks
diff --git a/app-i18n/fcitx5-qt/metadata.xml b/app-i18n/fcitx5-qt/metadata.xml
index b130cd39c..2f8670a8d 100644
--- a/app-i18n/fcitx5-qt/metadata.xml
+++ b/app-i18n/fcitx5-qt/metadata.xml
@@ -1,7 +1,7 @@
-
- tanekliang@gmail.com
-
+
+ tanekliang@gmail.com
+
diff --git a/app-i18n/fcitx5-rime/metadata.xml b/app-i18n/fcitx5-rime/metadata.xml
index b130cd39c..2f8670a8d 100644
--- a/app-i18n/fcitx5-rime/metadata.xml
+++ b/app-i18n/fcitx5-rime/metadata.xml
@@ -1,7 +1,7 @@
-
- tanekliang@gmail.com
-
+
+ tanekliang@gmail.com
+
diff --git a/app-i18n/fcitx5/metadata.xml b/app-i18n/fcitx5/metadata.xml
index 857cb32d3..6da50fbe6 100644
--- a/app-i18n/fcitx5/metadata.xml
+++ b/app-i18n/fcitx5/metadata.xml
@@ -1,14 +1,14 @@
-
- ak47m61@gmail.com
-
-
+
+ ak47m61@gmail.com
+
+
diff --git a/app-i18n/gcin/metadata.xml b/app-i18n/gcin/metadata.xml
index a49b67fcf..a71d96a63 100644
--- a/app-i18n/gcin/metadata.xml
+++ b/app-i18n/gcin/metadata.xml
@@ -1,7 +1,6 @@
- no-herd
gentoo-zh@googlegroups.com
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
index b0c809c03..14ca2951a 100644
--- a/app-i18n/ibus-rime/metadata.xml
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -1,18 +1,16 @@
- proxy-maintainers
- cjk
-
- dennis.yxun@gmail.com
- Lan Yixun (dlan)
-
-
-
- chen.sst@gmail.com
- Gong Chen
-
- http://code.google.com/p/rimeime/issues/list
- rimeime
-
+
+ dennis.yxun@gmail.com
+ Lan Yixun (dlan)
+
+
+
+ chen.sst@gmail.com
+ Gong Chen
+
+ http://code.google.com/p/rimeime/issues/list
+ rimeime
+
diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
index d9cd2cad6..7a38bb900 100644
--- a/app-i18n/man-pages-zh_CN/metadata.xml
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -1,7 +1,5 @@
-
-maintainer-needed@gentoo.org
-
+
diff --git a/app-i18n/zh-autoconvert/metadata.xml b/app-i18n/zh-autoconvert/metadata.xml
index 0841bd416..09326fd57 100644
--- a/app-i18n/zh-autoconvert/metadata.xml
+++ b/app-i18n/zh-autoconvert/metadata.xml
@@ -1,10 +1,9 @@
-cjk
-
-r0bertz@gentoo.org
-Zhang Le
-
-Chinese HZ/GB/BIG5/UNI/UTF7/UTF8 encodings auto-converter
+
+ r0bertz@gentoo.org
+ Zhang Le
+
+ Chinese HZ/GB/BIG5/UNI/UTF7/UTF8 encodings auto-converter
diff --git a/app-misc/gpick/metadata.xml b/app-misc/gpick/metadata.xml
index 20ce21971..7a38bb900 100644
--- a/app-misc/gpick/metadata.xml
+++ b/app-misc/gpick/metadata.xml
@@ -1,5 +1,5 @@
-no-herd
+
diff --git a/app-office/wps-office/metadata.xml b/app-office/wps-office/metadata.xml
index ee946e63d..9b6118fc1 100644
--- a/app-office/wps-office/metadata.xml
+++ b/app-office/wps-office/metadata.xml
@@ -1,7 +1,6 @@
- cjk
skykiss_2000@163.com
Havanna
diff --git a/app-text/groff-utf8/metadata.xml b/app-text/groff-utf8/metadata.xml
index 2d5852c16..7a38bb900 100644
--- a/app-text/groff-utf8/metadata.xml
+++ b/app-text/groff-utf8/metadata.xml
@@ -1,5 +1,5 @@
-cjk
+
diff --git a/app-text/reciteword-dicts/metadata.xml b/app-text/reciteword-dicts/metadata.xml
index 20ce21971..7a38bb900 100644
--- a/app-text/reciteword-dicts/metadata.xml
+++ b/app-text/reciteword-dicts/metadata.xml
@@ -1,5 +1,5 @@
-no-herd
+
diff --git a/app-text/reciteword/metadata.xml b/app-text/reciteword/metadata.xml
index 20ce21971..7a38bb900 100644
--- a/app-text/reciteword/metadata.xml
+++ b/app-text/reciteword/metadata.xml
@@ -1,5 +1,5 @@
-no-herd
+
diff --git a/app-text/srecite/metadata.xml b/app-text/srecite/metadata.xml
index 20ce21971..7a38bb900 100644
--- a/app-text/srecite/metadata.xml
+++ b/app-text/srecite/metadata.xml
@@ -1,5 +1,5 @@
-no-herd
+
diff --git a/app-text/xdvipdfmx/metadata.xml b/app-text/xdvipdfmx/metadata.xml
index b9ede3dc5..c67151919 100644
--- a/app-text/xdvipdfmx/metadata.xml
+++ b/app-text/xdvipdfmx/metadata.xml
@@ -1,14 +1,13 @@
-
-
- tex
-
- acevery@gmail.com
- Yu Yuwei
-
-
- This package provides the extended xdvi to pdf converter
- needed to deal with unicode enabled TeX's.
-
-
+
+
+
+ acevery@gmail.com
+ Yu Yuwei
+
+
+ This package provides the extended xdvi to pdf converter
+ needed to deal with unicode enabled TeX's.
+
+
diff --git a/dev-cpp/ETL/metadata.xml b/dev-cpp/ETL/metadata.xml
index b3066d7e8..20eab9345 100644
--- a/dev-cpp/ETL/metadata.xml
+++ b/dev-cpp/ETL/metadata.xml
@@ -1,10 +1,7 @@
-
- lu_zero@gentoo.org
- Luca Barbato
-
+
synfig
diff --git a/dev-libs/lunar-date/metadata.xml b/dev-libs/lunar-date/metadata.xml
index 9838174f9..8d31f2b29 100644
--- a/dev-libs/lunar-date/metadata.xml
+++ b/dev-libs/lunar-date/metadata.xml
@@ -1,11 +1,10 @@
- no-herd
-
- yetist@gmail.com
- maintaining in gentoo china overlay
-
- Chinese Lunar Library
+
+ yetist@gmail.com
+ maintaining in gentoo china overlay
+
+ Chinese Lunar Library
diff --git a/dev-php/pecl-solr/metadata.xml b/dev-php/pecl-solr/metadata.xml
index abaf29c54..31e786a30 100644
--- a/dev-php/pecl-solr/metadata.xml
+++ b/dev-php/pecl-solr/metadata.xml
@@ -1,6 +1,6 @@
- php
+
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 2613d788c..683fab252 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,8 +1,7 @@
-no-herd
-
-gentoo-china@googlegroups.com
-
+
+ gentoo-china@googlegroups.com
+
diff --git a/media-plugins/audacious-mac/metadata.xml b/media-plugins/audacious-mac/metadata.xml
index e1774e3d9..7a38bb900 100644
--- a/media-plugins/audacious-mac/metadata.xml
+++ b/media-plugins/audacious-mac/metadata.xml
@@ -1,5 +1,5 @@
-sound
+
diff --git a/media-plugins/osdlyrics/metadata.xml b/media-plugins/osdlyrics/metadata.xml
index cbdae758f..886179d28 100644
--- a/media-plugins/osdlyrics/metadata.xml
+++ b/media-plugins/osdlyrics/metadata.xml
@@ -1,11 +1,11 @@
-
- ak47m61@gmail.com
-
-
+
+ ak47m61@gmail.com
+
+
diff --git a/media-sound/feeluown/metadata.xml b/media-sound/feeluown/metadata.xml
index 97634fe05..c9c75901e 100644
--- a/media-sound/feeluown/metadata.xml
+++ b/media-sound/feeluown/metadata.xml
@@ -1,14 +1,14 @@
-
- ak47m61@gmail.com
-
-
+
+ ak47m61@gmail.com
+
+
diff --git a/net-im/freetalk/metadata.xml b/net-im/freetalk/metadata.xml
index e6233b5dc..7a38bb900 100644
--- a/net-im/freetalk/metadata.xml
+++ b/net-im/freetalk/metadata.xml
@@ -1,6 +1,5 @@
-no-herd
-maintainer-wanted@gentoo.org
+
diff --git a/net-misc/libipmsg/metadata.xml b/net-misc/libipmsg/metadata.xml
index 20ce21971..7a38bb900 100644
--- a/net-misc/libipmsg/metadata.xml
+++ b/net-misc/libipmsg/metadata.xml
@@ -1,5 +1,5 @@
-no-herd
+
diff --git a/net-misc/networkmanager-l2tp/metadata.xml b/net-misc/networkmanager-l2tp/metadata.xml
index 0bdeecc85..a71d96a63 100644
--- a/net-misc/networkmanager-l2tp/metadata.xml
+++ b/net-misc/networkmanager-l2tp/metadata.xml
@@ -1,8 +1,7 @@
-no-herd
-
-gentoo-zh@googlegroups.com
-
+
+ gentoo-zh@googlegroups.com
+
diff --git a/net-misc/omnitty/metadata.xml b/net-misc/omnitty/metadata.xml
index 2ee60cbca..f80ecb066 100644
--- a/net-misc/omnitty/metadata.xml
+++ b/net-misc/omnitty/metadata.xml
@@ -1,9 +1,8 @@
-no-herd
-
- chenpc@cs.nctu.edu.tw
- Chen Wen
-
+
+ chenpc@cs.nctu.edu.tw
+ Chen Wen
+
diff --git a/net-misc/pcmanx-gtk2/metadata.xml b/net-misc/pcmanx-gtk2/metadata.xml
index 0b019b0e7..7a38bb900 100644
--- a/net-misc/pcmanx-gtk2/metadata.xml
+++ b/net-misc/pcmanx-gtk2/metadata.xml
@@ -1,5 +1,5 @@
-mantainer-wanted
+
diff --git a/net-misc/you-get/metadata.xml b/net-misc/you-get/metadata.xml
index 6f49eba8f..7a38bb900 100644
--- a/net-misc/you-get/metadata.xml
+++ b/net-misc/you-get/metadata.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/net-proxy/lantern-bin/metadata.xml b/net-proxy/lantern-bin/metadata.xml
index e287c86e1..34946e12e 100644
--- a/net-proxy/lantern-bin/metadata.xml
+++ b/net-proxy/lantern-bin/metadata.xml
@@ -1,7 +1,6 @@
- net-proxy
registerdedicated@gmail.com
Register
diff --git a/net-proxy/libQtShadowsocks/metadata.xml b/net-proxy/libQtShadowsocks/metadata.xml
index 0b1b27809..d5179ad46 100644
--- a/net-proxy/libQtShadowsocks/metadata.xml
+++ b/net-proxy/libQtShadowsocks/metadata.xml
@@ -1,7 +1,6 @@
- net-proxy
registerdedicated@gmail.com
Register
diff --git a/net-proxy/make-proxy/metadata.xml b/net-proxy/make-proxy/metadata.xml
index 5ceddea61..6c3d908ab 100644
--- a/net-proxy/make-proxy/metadata.xml
+++ b/net-proxy/make-proxy/metadata.xml
@@ -1,13 +1,10 @@
- net-proxy
-
slogerdream@gmail.com
slogerdream
-