summaryrefslogtreecommitdiff
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 /media-fonts
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 'media-fonts')
-rw-r--r--media-fonts/Humor-Sans/metadata.xml5
-rw-r--r--media-fonts/acroread-asianfonts/metadata.xml10
-rw-r--r--media-fonts/alee-fonts/metadata.xml10
-rw-r--r--media-fonts/alegreya-sans/metadata.xml5
-rw-r--r--media-fonts/andika/metadata.xml5
-rw-r--r--media-fonts/anonymous-pro/metadata.xml5
-rw-r--r--media-fonts/aquafont/metadata.xml10
-rw-r--r--media-fonts/aquapfont/metadata.xml10
-rw-r--r--media-fonts/arabeyes-fonts/metadata.xml5
-rw-r--r--media-fonts/arkpandora/metadata.xml5
-rw-r--r--media-fonts/arphicfonts/metadata.xml10
-rw-r--r--media-fonts/artwiz-aleczapka-en/metadata.xml5
-rw-r--r--media-fonts/artwiz-latin1/metadata.xml5
-rw-r--r--media-fonts/baekmuk-fonts/metadata.xml10
-rw-r--r--media-fonts/bitstream-cyberbit/metadata.xml5
-rw-r--r--media-fonts/cantarell/metadata.xml5
-rw-r--r--media-fonts/cardo/metadata.xml5
-rw-r--r--media-fonts/cheapskatefonts/metadata.xml5
-rw-r--r--media-fonts/clearsans/metadata.xml5
-rw-r--r--media-fonts/cm-unicode/metadata.xml5
-rw-r--r--media-fonts/comic-neue/metadata.xml5
-rw-r--r--media-fonts/corefonts/metadata.xml5
-rw-r--r--media-fonts/courier-prime/metadata.xml5
-rw-r--r--media-fonts/cronyx-fonts/metadata.xml5
-rw-r--r--media-fonts/croscorefonts/metadata.xml5
-rw-r--r--media-fonts/culmus/metadata.xml5
-rw-r--r--media-fonts/dejavu/metadata.xml5
-rw-r--r--media-fonts/dina/metadata.xml5
-rw-r--r--media-fonts/droid/metadata.xml5
-rw-r--r--media-fonts/dzongkha-fonts/metadata.xml5
-rw-r--r--media-fonts/eb-garamond/metadata.xml5
-rw-r--r--media-fonts/efont-unicode/metadata.xml10
-rw-r--r--media-fonts/ekushey-bangla-fonts/metadata.xml5
-rw-r--r--media-fonts/encodings/metadata.xml5
-rw-r--r--media-fonts/essays1743/metadata.xml5
-rw-r--r--media-fonts/exljbris-free/metadata.xml5
-rw-r--r--media-fonts/exo/metadata.xml5
-rw-r--r--media-fonts/fantasque-sans-mono/metadata.xml5
-rw-r--r--media-fonts/farsi-fonts/metadata.xml5
-rw-r--r--media-fonts/fgdc-emergency/metadata.xml5
-rw-r--r--media-fonts/fifth-leg/metadata.xml5
-rw-r--r--media-fonts/fira-mono/metadata.xml5
-rw-r--r--media-fonts/fira-sans/metadata.xml5
-rw-r--r--media-fonts/font-adobe-100dpi/metadata.xml5
-rw-r--r--media-fonts/font-adobe-75dpi/metadata.xml5
-rw-r--r--media-fonts/font-adobe-utopia-100dpi/metadata.xml5
-rw-r--r--media-fonts/font-adobe-utopia-75dpi/metadata.xml5
-rw-r--r--media-fonts/font-adobe-utopia-type1/metadata.xml5
-rw-r--r--media-fonts/font-alias/metadata.xml5
-rw-r--r--media-fonts/font-arabic-misc/metadata.xml5
-rw-r--r--media-fonts/font-bh-100dpi/metadata.xml5
-rw-r--r--media-fonts/font-bh-75dpi/metadata.xml5
-rw-r--r--media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml5
-rw-r--r--media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml5
-rw-r--r--media-fonts/font-bh-ttf/metadata.xml5
-rw-r--r--media-fonts/font-bh-type1/metadata.xml5
-rw-r--r--media-fonts/font-bitstream-100dpi/metadata.xml5
-rw-r--r--media-fonts/font-bitstream-75dpi/metadata.xml5
-rw-r--r--media-fonts/font-bitstream-speedo/metadata.xml5
-rw-r--r--media-fonts/font-bitstream-type1/metadata.xml5
-rw-r--r--media-fonts/font-cronyx-cyrillic/metadata.xml5
-rw-r--r--media-fonts/font-cursor-misc/metadata.xml5
-rw-r--r--media-fonts/font-daewoo-misc/metadata.xml5
-rw-r--r--media-fonts/font-dec-misc/metadata.xml5
-rw-r--r--media-fonts/font-ibm-type1/metadata.xml5
-rw-r--r--media-fonts/font-isas-misc/metadata.xml5
-rw-r--r--media-fonts/font-jis-misc/metadata.xml5
-rw-r--r--media-fonts/font-micro-misc/metadata.xml5
-rw-r--r--media-fonts/font-misc-cyrillic/metadata.xml5
-rw-r--r--media-fonts/font-misc-ethiopic/metadata.xml5
-rw-r--r--media-fonts/font-misc-meltho/metadata.xml5
-rw-r--r--media-fonts/font-misc-misc/metadata.xml5
-rw-r--r--media-fonts/font-mutt-misc/metadata.xml5
-rw-r--r--media-fonts/font-schumacher-misc/metadata.xml5
-rw-r--r--media-fonts/font-screen-cyrillic/metadata.xml5
-rw-r--r--media-fonts/font-sony-misc/metadata.xml5
-rw-r--r--media-fonts/font-sun-misc/metadata.xml5
-rw-r--r--media-fonts/font-util/metadata.xml5
-rw-r--r--media-fonts/font-winitzki-cyrillic/metadata.xml5
-rw-r--r--media-fonts/font-xfree86-type1/metadata.xml5
-rw-r--r--media-fonts/free-bangla-font/metadata.xml5
-rw-r--r--media-fonts/freefont/metadata.xml5
-rw-r--r--media-fonts/freefonts/metadata.xml5
-rw-r--r--media-fonts/fs-fonts/metadata.xml10
-rw-r--r--media-fonts/gidole/metadata.xml5
-rw-r--r--media-fonts/hack/metadata.xml5
-rw-r--r--media-fonts/hermit/metadata.xml5
-rw-r--r--media-fonts/heuristica/metadata.xml5
-rw-r--r--media-fonts/hkscs-ming/metadata.xml5
-rw-r--r--media-fonts/hunkyfonts/metadata.xml5
-rw-r--r--media-fonts/inconsolata-hellenic/metadata.xml5
-rw-r--r--media-fonts/inconsolata/metadata.xml5
-rw-r--r--media-fonts/infinality-ultimate-meta/metadata.xml5
-rw-r--r--media-fonts/intlfonts/metadata.xml5
-rw-r--r--media-fonts/ipaex/metadata.xml10
-rw-r--r--media-fonts/ipamonafont/metadata.xml10
-rw-r--r--media-fonts/ja-ipafonts/metadata.xml10
-rw-r--r--media-fonts/jisx0213-fonts/metadata.xml10
-rw-r--r--media-fonts/jomolhari/metadata.xml5
-rw-r--r--media-fonts/jsmath-extra-dark/metadata.xml5
-rw-r--r--media-fonts/jsmath-extra-light/metadata.xml5
-rw-r--r--media-fonts/jsmath/metadata.xml5
-rw-r--r--media-fonts/kacst-fonts/metadata.xml5
-rw-r--r--media-fonts/kanjistrokeorders/metadata.xml10
-rw-r--r--media-fonts/khmer/metadata.xml5
-rw-r--r--media-fonts/kochi-substitute/metadata.xml10
-rw-r--r--media-fonts/konfont/metadata.xml10
-rw-r--r--media-fonts/koruri/metadata.xml5
-rw-r--r--media-fonts/lfpfonts-fix/metadata.xml5
-rw-r--r--media-fonts/lfpfonts-var/metadata.xml5
-rw-r--r--media-fonts/liberation-fonts/metadata.xml5
-rw-r--r--media-fonts/libertine/metadata.xml5
-rw-r--r--media-fonts/lklug/metadata.xml5
-rw-r--r--media-fonts/lohit-assamese/metadata.xml5
-rw-r--r--media-fonts/lohit-bengali/metadata.xml5
-rw-r--r--media-fonts/lohit-devanagari/metadata.xml5
-rw-r--r--media-fonts/lohit-fonts/metadata.xml5
-rw-r--r--media-fonts/lohit-gujarati/metadata.xml5
-rw-r--r--media-fonts/lohit-gurmukhi/metadata.xml5
-rw-r--r--media-fonts/lohit-kannada/metadata.xml5
-rw-r--r--media-fonts/lohit-malayalam/metadata.xml5
-rw-r--r--media-fonts/lohit-marathi/metadata.xml5
-rw-r--r--media-fonts/lohit-nepali/metadata.xml5
-rw-r--r--media-fonts/lohit-odia/metadata.xml5
-rw-r--r--media-fonts/lohit-tamil-classical/metadata.xml5
-rw-r--r--media-fonts/lohit-tamil/metadata.xml5
-rw-r--r--media-fonts/lohit-telugu/metadata.xml5
-rw-r--r--media-fonts/mathematica-fonts/metadata.xml5
-rw-r--r--media-fonts/mgopen/metadata.xml5
-rw-r--r--media-fonts/mikachan-font-otf/metadata.xml15
-rw-r--r--media-fonts/mikachan-font-ttc/metadata.xml15
-rw-r--r--media-fonts/mikachan-font-ttf/metadata.xml15
-rw-r--r--media-fonts/mix-mplus-ipa/metadata.xml5
-rw-r--r--media-fonts/monafont/metadata.xml10
-rw-r--r--media-fonts/monoid/metadata.xml5
-rw-r--r--media-fonts/mplus-fonts/metadata.xml10
-rw-r--r--media-fonts/mplus-outline-fonts/metadata.xml10
-rw-r--r--media-fonts/nanum/metadata.xml5
-rw-r--r--media-fonts/nanumfont/metadata.xml10
-rw-r--r--media-fonts/nepali-fonts/metadata.xml5
-rw-r--r--media-fonts/noto/metadata.xml5
-rw-r--r--media-fonts/nunito/metadata.xml10
-rw-r--r--media-fonts/nuosu-sil/metadata.xml5
-rw-r--r--media-fonts/ohsnap/metadata.xml5
-rw-r--r--media-fonts/oldstandard/metadata.xml5
-rw-r--r--media-fonts/open-sans/metadata.xml5
-rw-r--r--media-fonts/opendesktop-fonts/metadata.xml10
-rw-r--r--media-fonts/oto/metadata.xml5
-rw-r--r--media-fonts/paratype/metadata.xml5
-rw-r--r--media-fonts/pcf2bdf/metadata.xml5
-rw-r--r--media-fonts/pigiarniq/metadata.xml5
-rw-r--r--media-fonts/pothana2k/metadata.xml5
-rw-r--r--media-fonts/powerline-symbols/metadata.xml5
-rw-r--r--media-fonts/proggy-fonts/metadata.xml5
-rw-r--r--media-fonts/qomolangma/metadata.xml5
-rw-r--r--media-fonts/quivira/metadata.xml5
-rw-r--r--media-fonts/ricty/metadata.xml5
-rw-r--r--media-fonts/roboto/metadata.xml5
-rw-r--r--media-fonts/sazanami/metadata.xml10
-rw-r--r--media-fonts/sgi-fonts/metadata.xml5
-rw-r--r--media-fonts/shinonome/metadata.xml10
-rw-r--r--media-fonts/signika/metadata.xml5
-rw-r--r--media-fonts/sil-abyssinica/metadata.xml5
-rw-r--r--media-fonts/sil-arabicfonts/metadata.xml5
-rw-r--r--media-fonts/sil-charis/metadata.xml5
-rw-r--r--media-fonts/sil-doulos/metadata.xml5
-rw-r--r--media-fonts/sil-ezra/metadata.xml5
-rw-r--r--media-fonts/sil-galatia/metadata.xml5
-rw-r--r--media-fonts/sil-gentium/metadata.xml5
-rw-r--r--media-fonts/sil-padauk/metadata.xml5
-rw-r--r--media-fonts/sophia-nubian/metadata.xml5
-rw-r--r--media-fonts/source-han-sans/metadata.xml5
-rw-r--r--media-fonts/source-pro/metadata.xml5
-rw-r--r--media-fonts/stix-fonts/metadata.xml5
-rw-r--r--media-fonts/symbola/metadata.xml5
-rw-r--r--media-fonts/takao-fonts/metadata.xml10
-rw-r--r--media-fonts/tengwar-fonts/metadata.xml5
-rw-r--r--media-fonts/terminus-font/metadata.xml5
-rw-r--r--media-fonts/tex-gyre/metadata.xml5
-rw-r--r--media-fonts/texcm-ttf/metadata.xml5
-rw-r--r--media-fonts/thaifonts-scalable/metadata.xml5
-rw-r--r--media-fonts/tibetan-machine-font/metadata.xml5
-rw-r--r--media-fonts/ttf-bitstream-vera/metadata.xml5
-rw-r--r--media-fonts/ubuntu-font-family/metadata.xml5
-rw-r--r--media-fonts/umeplus-fonts/metadata.xml10
-rw-r--r--media-fonts/unfonts-extra/metadata.xml10
-rw-r--r--media-fonts/unfonts/metadata.xml10
-rw-r--r--media-fonts/unifont/metadata.xml10
-rw-r--r--media-fonts/urw-fonts/metadata.xml5
-rw-r--r--media-fonts/urwvn-fonts/metadata.xml5
-rw-r--r--media-fonts/vc-fonts/metadata.xml5
-rw-r--r--media-fonts/vdrsymbols-ttf/metadata.xml1
-rw-r--r--media-fonts/viga/metadata.xml5
-rw-r--r--media-fonts/vlgothic/metadata.xml10
-rw-r--r--media-fonts/vollkorn/metadata.xml5
-rw-r--r--media-fonts/webby-fonts/metadata.xml5
-rw-r--r--media-fonts/wqy-bitmapfont/metadata.xml10
-rw-r--r--media-fonts/wqy-microhei/metadata.xml10
-rw-r--r--media-fonts/wqy-unibit/metadata.xml10
-rw-r--r--media-fonts/wqy-zenhei/metadata.xml5
-rw-r--r--media-fonts/x11fonts-jmk/metadata.xml5
-rw-r--r--media-fonts/zh-kcfonts/metadata.xml10
202 files changed, 960 insertions, 241 deletions
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index ad40b69bb82..e2231bc233f 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/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>proxy-maintainers</herd>
<maintainer>
<email>bertrand@jacquin.bzh</email>
<name>Bertrand Jacquin</name>
<description>Proxied maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>A sanserif typeface in the style of xkcd.</longdescription>
</pkgmetadata>
diff --git a/media-fonts/acroread-asianfonts/metadata.xml b/media-fonts/acroread-asianfonts/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/acroread-asianfonts/metadata.xml
+++ b/media-fonts/acroread-asianfonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/alee-fonts/metadata.xml b/media-fonts/alee-fonts/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/alee-fonts/metadata.xml
+++ b/media-fonts/alee-fonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/alegreya-sans/metadata.xml b/media-fonts/alegreya-sans/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/alegreya-sans/metadata.xml
+++ b/media-fonts/alegreya-sans/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/andika/metadata.xml b/media-fonts/andika/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/andika/metadata.xml
+++ b/media-fonts/andika/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/anonymous-pro/metadata.xml b/media-fonts/anonymous-pro/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/anonymous-pro/metadata.xml
+++ b/media-fonts/anonymous-pro/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/aquafont/metadata.xml b/media-fonts/aquafont/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/aquafont/metadata.xml
+++ b/media-fonts/aquafont/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/aquapfont/metadata.xml b/media-fonts/aquapfont/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/aquapfont/metadata.xml
+++ b/media-fonts/aquapfont/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/arabeyes-fonts/metadata.xml b/media-fonts/arabeyes-fonts/metadata.xml
index 10219b66e4c..c6f5487d565 100644
--- a/media-fonts/arabeyes-fonts/metadata.xml
+++ b/media-fonts/arabeyes-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">arabeyes</remote-id>
</upstream>
diff --git a/media-fonts/arkpandora/metadata.xml b/media-fonts/arkpandora/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/arkpandora/metadata.xml
+++ b/media-fonts/arkpandora/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/arphicfonts/metadata.xml b/media-fonts/arphicfonts/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/arphicfonts/metadata.xml
+++ b/media-fonts/arphicfonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/artwiz-aleczapka-en/metadata.xml b/media-fonts/artwiz-aleczapka-en/metadata.xml
index d0c3fedc364..1e6dca73a75 100644
--- a/media-fonts/artwiz-aleczapka-en/metadata.xml
+++ b/media-fonts/artwiz-aleczapka-en/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">artwizaleczapka</remote-id>
</upstream>
diff --git a/media-fonts/artwiz-latin1/metadata.xml b/media-fonts/artwiz-latin1/metadata.xml
index e1d9dbb8321..4c7ae86944f 100644
--- a/media-fonts/artwiz-latin1/metadata.xml
+++ b/media-fonts/artwiz-latin1/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">artwiz-latin1</remote-id>
</upstream>
diff --git a/media-fonts/baekmuk-fonts/metadata.xml b/media-fonts/baekmuk-fonts/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/baekmuk-fonts/metadata.xml
+++ b/media-fonts/baekmuk-fonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/bitstream-cyberbit/metadata.xml b/media-fonts/bitstream-cyberbit/metadata.xml
index 328060bef94..da6bc2b968d 100644
--- a/media-fonts/bitstream-cyberbit/metadata.xml
+++ b/media-fonts/bitstream-cyberbit/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>fonts</herd>
<maintainer>
<email>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/cantarell/metadata.xml b/media-fonts/cantarell/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/media-fonts/cantarell/metadata.xml
+++ b/media-fonts/cantarell/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/media-fonts/cardo/metadata.xml b/media-fonts/cardo/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/cardo/metadata.xml
+++ b/media-fonts/cardo/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/cheapskatefonts/metadata.xml b/media-fonts/cheapskatefonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/cheapskatefonts/metadata.xml
+++ b/media-fonts/cheapskatefonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/clearsans/metadata.xml b/media-fonts/clearsans/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/clearsans/metadata.xml
+++ b/media-fonts/clearsans/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/cm-unicode/metadata.xml b/media-fonts/cm-unicode/metadata.xml
index c1dd88383ed..a30bf104e1e 100644
--- a/media-fonts/cm-unicode/metadata.xml
+++ b/media-fonts/cm-unicode/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">cm-unicode</remote-id>
</upstream>
diff --git a/media-fonts/comic-neue/metadata.xml b/media-fonts/comic-neue/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/comic-neue/metadata.xml
+++ b/media-fonts/comic-neue/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/corefonts/metadata.xml b/media-fonts/corefonts/metadata.xml
index 7a791b502db..db422a7a793 100644
--- a/media-fonts/corefonts/metadata.xml
+++ b/media-fonts/corefonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="tahoma">Also install the Tahoma font. Due to the lack of a free
bold variant, this may render badly. See bug 184790.</flag>
diff --git a/media-fonts/courier-prime/metadata.xml b/media-fonts/courier-prime/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/courier-prime/metadata.xml
+++ b/media-fonts/courier-prime/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/cronyx-fonts/metadata.xml b/media-fonts/cronyx-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/cronyx-fonts/metadata.xml
+++ b/media-fonts/cronyx-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/croscorefonts/metadata.xml b/media-fonts/croscorefonts/metadata.xml
index 37e5dd1e45f..ca70c071faf 100644
--- a/media-fonts/croscorefonts/metadata.xml
+++ b/media-fonts/croscorefonts/metadata.xml
@@ -4,7 +4,10 @@
<maintainer>
<email>yngwin@gentoo.org</email>
</maintainer>
- <herd>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Arimo, Cousine and Tinos were designed by Steve Matteson as innovative,
refreshing default on-screen font designs that are metrically compatible
diff --git a/media-fonts/culmus/metadata.xml b/media-fonts/culmus/metadata.xml
index b5eb37014b4..e2104c4ea31 100644
--- a/media-fonts/culmus/metadata.xml
+++ b/media-fonts/culmus/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="ancient">Install ancient semitic scripts</flag>
<flag name="fancy">Install fancy fonts</flag>
diff --git a/media-fonts/dejavu/metadata.xml b/media-fonts/dejavu/metadata.xml
index 13468490f64..5cffa99d986 100644
--- a/media-fonts/dejavu/metadata.xml
+++ b/media-fonts/dejavu/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
</use>
diff --git a/media-fonts/dina/metadata.xml b/media-fonts/dina/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/dina/metadata.xml
+++ b/media-fonts/dina/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/droid/metadata.xml b/media-fonts/droid/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/droid/metadata.xml
+++ b/media-fonts/droid/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/dzongkha-fonts/metadata.xml b/media-fonts/dzongkha-fonts/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/dzongkha-fonts/metadata.xml
+++ b/media-fonts/dzongkha-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/eb-garamond/metadata.xml b/media-fonts/eb-garamond/metadata.xml
index f48034fd6e2..75235812010 100644
--- a/media-fonts/eb-garamond/metadata.xml
+++ b/media-fonts/eb-garamond/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="bitbucket">georgd/eb-garamond</remote-id>
</upstream>
diff --git a/media-fonts/efont-unicode/metadata.xml b/media-fonts/efont-unicode/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/efont-unicode/metadata.xml
+++ b/media-fonts/efont-unicode/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/ekushey-bangla-fonts/metadata.xml b/media-fonts/ekushey-bangla-fonts/metadata.xml
index be42e9a8c17..9cefdeec901 100644
--- a/media-fonts/ekushey-bangla-fonts/metadata.xml
+++ b/media-fonts/ekushey-bangla-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ekushey</remote-id>
</upstream>
diff --git a/media-fonts/encodings/metadata.xml b/media-fonts/encodings/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/encodings/metadata.xml
+++ b/media-fonts/encodings/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/essays1743/metadata.xml b/media-fonts/essays1743/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/essays1743/metadata.xml
+++ b/media-fonts/essays1743/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/exljbris-free/metadata.xml b/media-fonts/exljbris-free/metadata.xml
index 7a68d4d4b7a..6941e2d610b 100644
--- a/media-fonts/exljbris-free/metadata.xml
+++ b/media-fonts/exljbris-free/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Free fonts from exljbris. Includes the fonts: Delicious, Diavlo, Fontin,
Fontin Sans and Tallys.
diff --git a/media-fonts/exo/metadata.xml b/media-fonts/exo/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/exo/metadata.xml
+++ b/media-fonts/exo/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/fantasque-sans-mono/metadata.xml b/media-fonts/fantasque-sans-mono/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/fantasque-sans-mono/metadata.xml
+++ b/media-fonts/fantasque-sans-mono/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/farsi-fonts/metadata.xml b/media-fonts/farsi-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/farsi-fonts/metadata.xml
+++ b/media-fonts/farsi-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/fgdc-emergency/metadata.xml b/media-fonts/fgdc-emergency/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/fgdc-emergency/metadata.xml
+++ b/media-fonts/fgdc-emergency/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/fifth-leg/metadata.xml b/media-fonts/fifth-leg/metadata.xml
index 715bb3c8c55..7e9a0a6b338 100644
--- a/media-fonts/fifth-leg/metadata.xml
+++ b/media-fonts/fifth-leg/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>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
Fifth Leg font is simplistic, technical sans serif. It is used for openSUSE branded material. Free alternative that mimics Cholla font.
</longdescription>
diff --git a/media-fonts/fira-mono/metadata.xml b/media-fonts/fira-mono/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/fira-mono/metadata.xml
+++ b/media-fonts/fira-mono/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/fira-sans/metadata.xml b/media-fonts/fira-sans/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/fira-sans/metadata.xml
+++ b/media-fonts/fira-sans/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-100dpi/metadata.xml b/media-fonts/font-adobe-100dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-adobe-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-100dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-75dpi/metadata.xml b/media-fonts/font-adobe-75dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-adobe-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-75dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-100dpi/metadata.xml b/media-fonts/font-adobe-utopia-100dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-adobe-utopia-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-100dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-75dpi/metadata.xml b/media-fonts/font-adobe-utopia-75dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-adobe-utopia-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-75dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-type1/metadata.xml b/media-fonts/font-adobe-utopia-type1/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-adobe-utopia-type1/metadata.xml
+++ b/media-fonts/font-adobe-utopia-type1/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-alias/metadata.xml b/media-fonts/font-alias/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-alias/metadata.xml
+++ b/media-fonts/font-alias/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-arabic-misc/metadata.xml b/media-fonts/font-arabic-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-arabic-misc/metadata.xml
+++ b/media-fonts/font-arabic-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-100dpi/metadata.xml b/media-fonts/font-bh-100dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-100dpi/metadata.xml
+++ b/media-fonts/font-bh-100dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-75dpi/metadata.xml b/media-fonts/font-bh-75dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-75dpi/metadata.xml
+++ b/media-fonts/font-bh-75dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-ttf/metadata.xml b/media-fonts/font-bh-ttf/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-ttf/metadata.xml
+++ b/media-fonts/font-bh-ttf/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bh-type1/metadata.xml b/media-fonts/font-bh-type1/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bh-type1/metadata.xml
+++ b/media-fonts/font-bh-type1/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bitstream-100dpi/metadata.xml b/media-fonts/font-bitstream-100dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bitstream-100dpi/metadata.xml
+++ b/media-fonts/font-bitstream-100dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bitstream-75dpi/metadata.xml b/media-fonts/font-bitstream-75dpi/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bitstream-75dpi/metadata.xml
+++ b/media-fonts/font-bitstream-75dpi/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bitstream-speedo/metadata.xml b/media-fonts/font-bitstream-speedo/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bitstream-speedo/metadata.xml
+++ b/media-fonts/font-bitstream-speedo/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-bitstream-type1/metadata.xml b/media-fonts/font-bitstream-type1/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-bitstream-type1/metadata.xml
+++ b/media-fonts/font-bitstream-type1/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-cronyx-cyrillic/metadata.xml b/media-fonts/font-cronyx-cyrillic/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-cronyx-cyrillic/metadata.xml
+++ b/media-fonts/font-cronyx-cyrillic/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-cursor-misc/metadata.xml b/media-fonts/font-cursor-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-cursor-misc/metadata.xml
+++ b/media-fonts/font-cursor-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-daewoo-misc/metadata.xml b/media-fonts/font-daewoo-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-daewoo-misc/metadata.xml
+++ b/media-fonts/font-daewoo-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-dec-misc/metadata.xml b/media-fonts/font-dec-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-dec-misc/metadata.xml
+++ b/media-fonts/font-dec-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-ibm-type1/metadata.xml b/media-fonts/font-ibm-type1/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-ibm-type1/metadata.xml
+++ b/media-fonts/font-ibm-type1/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-isas-misc/metadata.xml b/media-fonts/font-isas-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-isas-misc/metadata.xml
+++ b/media-fonts/font-isas-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-jis-misc/metadata.xml b/media-fonts/font-jis-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-jis-misc/metadata.xml
+++ b/media-fonts/font-jis-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-micro-misc/metadata.xml b/media-fonts/font-micro-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-micro-misc/metadata.xml
+++ b/media-fonts/font-micro-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-misc-cyrillic/metadata.xml b/media-fonts/font-misc-cyrillic/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-misc-cyrillic/metadata.xml
+++ b/media-fonts/font-misc-cyrillic/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-misc-ethiopic/metadata.xml b/media-fonts/font-misc-ethiopic/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-misc-ethiopic/metadata.xml
+++ b/media-fonts/font-misc-ethiopic/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-misc-meltho/metadata.xml b/media-fonts/font-misc-meltho/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-misc-meltho/metadata.xml
+++ b/media-fonts/font-misc-meltho/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-misc-misc/metadata.xml b/media-fonts/font-misc-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-misc-misc/metadata.xml
+++ b/media-fonts/font-misc-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-mutt-misc/metadata.xml b/media-fonts/font-mutt-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-mutt-misc/metadata.xml
+++ b/media-fonts/font-mutt-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-schumacher-misc/metadata.xml b/media-fonts/font-schumacher-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-schumacher-misc/metadata.xml
+++ b/media-fonts/font-schumacher-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-screen-cyrillic/metadata.xml b/media-fonts/font-screen-cyrillic/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-screen-cyrillic/metadata.xml
+++ b/media-fonts/font-screen-cyrillic/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-sony-misc/metadata.xml b/media-fonts/font-sony-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-sony-misc/metadata.xml
+++ b/media-fonts/font-sony-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-sun-misc/metadata.xml b/media-fonts/font-sun-misc/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-sun-misc/metadata.xml
+++ b/media-fonts/font-sun-misc/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-util/metadata.xml b/media-fonts/font-util/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-util/metadata.xml
+++ b/media-fonts/font-util/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-winitzki-cyrillic/metadata.xml b/media-fonts/font-winitzki-cyrillic/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-winitzki-cyrillic/metadata.xml
+++ b/media-fonts/font-winitzki-cyrillic/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/font-xfree86-type1/metadata.xml b/media-fonts/font-xfree86-type1/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-fonts/font-xfree86-type1/metadata.xml
+++ b/media-fonts/font-xfree86-type1/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/free-bangla-font/metadata.xml b/media-fonts/free-bangla-font/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/free-bangla-font/metadata.xml
+++ b/media-fonts/free-bangla-font/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/freefont/metadata.xml b/media-fonts/freefont/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/freefont/metadata.xml
+++ b/media-fonts/freefont/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/freefonts/metadata.xml b/media-fonts/freefonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/freefonts/metadata.xml
+++ b/media-fonts/freefonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/fs-fonts/metadata.xml b/media-fonts/fs-fonts/metadata.xml
index 7fc9573410e..0214a899796 100644
--- a/media-fonts/fs-fonts/metadata.xml
+++ b/media-fonts/fs-fonts/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">x-tt</remote-id>
</upstream>
diff --git a/media-fonts/gidole/metadata.xml b/media-fonts/gidole/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/gidole/metadata.xml
+++ b/media-fonts/gidole/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/hack/metadata.xml b/media-fonts/hack/metadata.xml
index 85e82b7e2d0..e5f877dd694 100644
--- a/media-fonts/hack/metadata.xml
+++ b/media-fonts/hack/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">chrissimpkins/Hack</remote-id>
</upstream>
diff --git a/media-fonts/hermit/metadata.xml b/media-fonts/hermit/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/hermit/metadata.xml
+++ b/media-fonts/hermit/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/heuristica/metadata.xml b/media-fonts/heuristica/metadata.xml
index 49a544d5ee7..924f21961da 100644
--- a/media-fonts/heuristica/metadata.xml
+++ b/media-fonts/heuristica/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">evristika</remote-id>
</upstream>
diff --git a/media-fonts/hkscs-ming/metadata.xml b/media-fonts/hkscs-ming/metadata.xml
index aef01fc3d59..c746f2860f8 100644
--- a/media-fonts/hkscs-ming/metadata.xml
+++ b/media-fonts/hkscs-ming/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/hunkyfonts/metadata.xml b/media-fonts/hunkyfonts/metadata.xml
index d52e94094b1..80efd9446eb 100644
--- a/media-fonts/hunkyfonts/metadata.xml
+++ b/media-fonts/hunkyfonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription>Hunky Fonts are free TrueType fonts based on Bitstream's Vera fonts with additional letters for Baltic, Central European, South European and other languages, including Maori, Welsh and Esperanto.</longdescription>
<upstream>
<remote-id type="sourceforge">hunkyfonts</remote-id>
diff --git a/media-fonts/inconsolata-hellenic/metadata.xml b/media-fonts/inconsolata-hellenic/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/inconsolata-hellenic/metadata.xml
+++ b/media-fonts/inconsolata-hellenic/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/inconsolata/metadata.xml b/media-fonts/inconsolata/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/inconsolata/metadata.xml
+++ b/media-fonts/inconsolata/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/infinality-ultimate-meta/metadata.xml b/media-fonts/infinality-ultimate-meta/metadata.xml
index 73b73031e35..60b4a68073f 100644
--- a/media-fonts/infinality-ultimate-meta/metadata.xml
+++ b/media-fonts/infinality-ultimate-meta/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>fonts</herd>
<maintainer>
<email>witold.pilat@gmail.com</email>
<description>Proxied/co-maintainer. CC on bugs.</description>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="free">Install fonts for the "free" preset</flag>
<flag name="latin">Install additional latin fonts</flag>
diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index 3a0faca39ed..7ca970959a0 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
<use>
<flag name="bdf">Installs BDF fonts in addition to PCF</flag>
</use>
diff --git a/media-fonts/ipaex/metadata.xml b/media-fonts/ipaex/metadata.xml
index 997affade24..7fc984ce2c5 100644
--- a/media-fonts/ipaex/metadata.xml
+++ b/media-fonts/ipaex/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/ipamonafont/metadata.xml b/media-fonts/ipamonafont/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/ipamonafont/metadata.xml
+++ b/media-fonts/ipamonafont/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/ja-ipafonts/metadata.xml b/media-fonts/ja-ipafonts/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/ja-ipafonts/metadata.xml
+++ b/media-fonts/ja-ipafonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/jisx0213-fonts/metadata.xml b/media-fonts/jisx0213-fonts/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/jisx0213-fonts/metadata.xml
+++ b/media-fonts/jisx0213-fonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/jomolhari/metadata.xml b/media-fonts/jomolhari/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/jomolhari/metadata.xml
+++ b/media-fonts/jomolhari/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/jsmath-extra-dark/metadata.xml b/media-fonts/jsmath-extra-dark/metadata.xml
index a751914a715..00b3756801c 100644
--- a/media-fonts/jsmath-extra-dark/metadata.xml
+++ b/media-fonts/jsmath-extra-dark/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>sci-mathematics</herd>
+<maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+</maintainer>
<longdescription lang="en">
Extra jsMath fonts, dark version. Used in math web sites.
</longdescription>
diff --git a/media-fonts/jsmath-extra-light/metadata.xml b/media-fonts/jsmath-extra-light/metadata.xml
index fe7001dc4de..3fa0b73e0d8 100644
--- a/media-fonts/jsmath-extra-light/metadata.xml
+++ b/media-fonts/jsmath-extra-light/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>sci-mathematics</herd>
+<maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+</maintainer>
<longdescription lang="en">
Extra jsMath fonts, light version. Used in math web sites.
</longdescription>
diff --git a/media-fonts/jsmath/metadata.xml b/media-fonts/jsmath/metadata.xml
index 4743f5200f6..f645a427ea7 100644
--- a/media-fonts/jsmath/metadata.xml
+++ b/media-fonts/jsmath/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>sci-mathematics</herd>
+<maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+</maintainer>
<longdescription lang="en">
Rasterized fonts saved in image files to enable viewing of jsMath
pages by a web-browser which is missing access to TeX fonts.
diff --git a/media-fonts/kacst-fonts/metadata.xml b/media-fonts/kacst-fonts/metadata.xml
index 10219b66e4c..c6f5487d565 100644
--- a/media-fonts/kacst-fonts/metadata.xml
+++ b/media-fonts/kacst-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">arabeyes</remote-id>
</upstream>
diff --git a/media-fonts/kanjistrokeorders/metadata.xml b/media-fonts/kanjistrokeorders/metadata.xml
index 89a87a77fa9..69ff40eca96 100644
--- a/media-fonts/kanjistrokeorders/metadata.xml
+++ b/media-fonts/kanjistrokeorders/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/khmer/metadata.xml b/media-fonts/khmer/metadata.xml
index 0bfa1992eff..2c052194c52 100644
--- a/media-fonts/khmer/metadata.xml
+++ b/media-fonts/khmer/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">khmer</remote-id>
</upstream>
diff --git a/media-fonts/kochi-substitute/metadata.xml b/media-fonts/kochi-substitute/metadata.xml
index 7598201f23e..6fb81686b1f 100644
--- a/media-fonts/kochi-substitute/metadata.xml
+++ b/media-fonts/kochi-substitute/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">efont</remote-id>
</upstream>
diff --git a/media-fonts/konfont/metadata.xml b/media-fonts/konfont/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/konfont/metadata.xml
+++ b/media-fonts/konfont/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/koruri/metadata.xml b/media-fonts/koruri/metadata.xml
index e0ae22e4310..5a77eb55c8c 100644
--- a/media-fonts/koruri/metadata.xml
+++ b/media-fonts/koruri/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">koruri</remote-id>
</upstream>
diff --git a/media-fonts/lfpfonts-fix/metadata.xml b/media-fonts/lfpfonts-fix/metadata.xml
index bfe82106acd..a87d9190257 100644
--- a/media-fonts/lfpfonts-fix/metadata.xml
+++ b/media-fonts/lfpfonts-fix/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xfonts</remote-id>
</upstream>
diff --git a/media-fonts/lfpfonts-var/metadata.xml b/media-fonts/lfpfonts-var/metadata.xml
index 81f87bb5451..47ad18b99e1 100644
--- a/media-fonts/lfpfonts-var/metadata.xml
+++ b/media-fonts/lfpfonts-var/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xfonts</remote-id>
</upstream>
diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index ed1a4a131b4..71fd89cd8dc 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/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>fonts</herd>
<maintainer>
<email>je_fro@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
</use>
diff --git a/media-fonts/libertine/metadata.xml b/media-fonts/libertine/metadata.xml
index 23cc4c91a9c..a3ad695e871 100644
--- a/media-fonts/libertine/metadata.xml
+++ b/media-fonts/libertine/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">linuxlibertine</remote-id>
</upstream>
diff --git a/media-fonts/lklug/metadata.xml b/media-fonts/lklug/metadata.xml
index 38b5387e39f..1df2e332bc2 100644
--- a/media-fonts/lklug/metadata.xml
+++ b/media-fonts/lklug/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sinhala</remote-id>
</upstream>
diff --git a/media-fonts/lohit-assamese/metadata.xml b/media-fonts/lohit-assamese/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-assamese/metadata.xml
+++ b/media-fonts/lohit-assamese/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-bengali/metadata.xml b/media-fonts/lohit-bengali/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-bengali/metadata.xml
+++ b/media-fonts/lohit-bengali/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-devanagari/metadata.xml b/media-fonts/lohit-devanagari/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-devanagari/metadata.xml
+++ b/media-fonts/lohit-devanagari/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-fonts/metadata.xml b/media-fonts/lohit-fonts/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/lohit-fonts/metadata.xml
+++ b/media-fonts/lohit-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-gujarati/metadata.xml b/media-fonts/lohit-gujarati/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-gujarati/metadata.xml
+++ b/media-fonts/lohit-gujarati/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-gurmukhi/metadata.xml b/media-fonts/lohit-gurmukhi/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-gurmukhi/metadata.xml
+++ b/media-fonts/lohit-gurmukhi/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-kannada/metadata.xml b/media-fonts/lohit-kannada/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-kannada/metadata.xml
+++ b/media-fonts/lohit-kannada/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-malayalam/metadata.xml b/media-fonts/lohit-malayalam/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-malayalam/metadata.xml
+++ b/media-fonts/lohit-malayalam/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-marathi/metadata.xml b/media-fonts/lohit-marathi/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-marathi/metadata.xml
+++ b/media-fonts/lohit-marathi/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-nepali/metadata.xml b/media-fonts/lohit-nepali/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-nepali/metadata.xml
+++ b/media-fonts/lohit-nepali/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-odia/metadata.xml b/media-fonts/lohit-odia/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-odia/metadata.xml
+++ b/media-fonts/lohit-odia/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-tamil-classical/metadata.xml b/media-fonts/lohit-tamil-classical/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-tamil-classical/metadata.xml
+++ b/media-fonts/lohit-tamil-classical/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-tamil/metadata.xml b/media-fonts/lohit-tamil/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-tamil/metadata.xml
+++ b/media-fonts/lohit-tamil/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/lohit-telugu/metadata.xml b/media-fonts/lohit-telugu/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/lohit-telugu/metadata.xml
+++ b/media-fonts/lohit-telugu/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/mathematica-fonts/metadata.xml b/media-fonts/mathematica-fonts/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/mathematica-fonts/metadata.xml
+++ b/media-fonts/mathematica-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/mgopen/metadata.xml b/media-fonts/mgopen/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/mgopen/metadata.xml
+++ b/media-fonts/mgopen/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/mikachan-font-otf/metadata.xml b/media-fonts/mikachan-font-otf/metadata.xml
index 94558b474c6..4cb129fc017 100644
--- a/media-fonts/mikachan-font-otf/metadata.xml
+++ b/media-fonts/mikachan-font-otf/metadata.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
-<herd>x11</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/mikachan-font-ttc/metadata.xml b/media-fonts/mikachan-font-ttc/metadata.xml
index 94558b474c6..4cb129fc017 100644
--- a/media-fonts/mikachan-font-ttc/metadata.xml
+++ b/media-fonts/mikachan-font-ttc/metadata.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
-<herd>x11</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/mikachan-font-ttf/metadata.xml b/media-fonts/mikachan-font-ttf/metadata.xml
index 15f1ae36979..cb78e691db1 100644
--- a/media-fonts/mikachan-font-ttf/metadata.xml
+++ b/media-fonts/mikachan-font-ttf/metadata.xml
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
- <herd>x11</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">mikachan</remote-id>
</upstream>
diff --git a/media-fonts/mix-mplus-ipa/metadata.xml b/media-fonts/mix-mplus-ipa/metadata.xml
index 09d78af11f0..7744ab96b94 100644
--- a/media-fonts/mix-mplus-ipa/metadata.xml
+++ b/media-fonts/mix-mplus-ipa/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">mix-mplus-ipa</remote-id>
</upstream>
diff --git a/media-fonts/monafont/metadata.xml b/media-fonts/monafont/metadata.xml
index b009a20c9f2..7b8c3e7bacf 100644
--- a/media-fonts/monafont/metadata.xml
+++ b/media-fonts/monafont/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">monafont</remote-id>
</upstream>
diff --git a/media-fonts/monoid/metadata.xml b/media-fonts/monoid/metadata.xml
index b7443646b61..5ff8996ce01 100644
--- a/media-fonts/monoid/metadata.xml
+++ b/media-fonts/monoid/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">larsenwork/monoid</remote-id>
</upstream>
diff --git a/media-fonts/mplus-fonts/metadata.xml b/media-fonts/mplus-fonts/metadata.xml
index 8a4960d6820..7a2fb19dcdb 100644
--- a/media-fonts/mplus-fonts/metadata.xml
+++ b/media-fonts/mplus-fonts/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">mplus-fonts</remote-id>
</upstream>
diff --git a/media-fonts/mplus-outline-fonts/metadata.xml b/media-fonts/mplus-outline-fonts/metadata.xml
index 95f7b23dec2..f79cf48237e 100644
--- a/media-fonts/mplus-outline-fonts/metadata.xml
+++ b/media-fonts/mplus-outline-fonts/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="ipafont">Generates new fonts merged with <pkg>media-fonts/ja-ipafonts</pkg></flag>
</use>
diff --git a/media-fonts/nanum/metadata.xml b/media-fonts/nanum/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/nanum/metadata.xml
+++ b/media-fonts/nanum/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/nanumfont/metadata.xml b/media-fonts/nanumfont/metadata.xml
index 89a87a77fa9..69ff40eca96 100644
--- a/media-fonts/nanumfont/metadata.xml
+++ b/media-fonts/nanumfont/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/nepali-fonts/metadata.xml b/media-fonts/nepali-fonts/metadata.xml
index 651397866e4..9614071aa40 100644
--- a/media-fonts/nepali-fonts/metadata.xml
+++ b/media-fonts/nepali-fonts/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
<maintainer>
<email>vapier@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/nunito/metadata.xml b/media-fonts/nunito/metadata.xml
index 8194343ba08..9cbf5f40405 100644
--- a/media-fonts/nunito/metadata.xml
+++ b/media-fonts/nunito/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>fonts</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Nunito is a well balanced Sans Serif with rounded terminals. Nunito has
been designed mainly to be used as a display font but is useable as a
diff --git a/media-fonts/nuosu-sil/metadata.xml b/media-fonts/nuosu-sil/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/nuosu-sil/metadata.xml
+++ b/media-fonts/nuosu-sil/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/ohsnap/metadata.xml b/media-fonts/ohsnap/metadata.xml
index f8a4a335c69..fb723a5de96 100644
--- a/media-fonts/ohsnap/metadata.xml
+++ b/media-fonts/ohsnap/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">osnapfont</remote-id>
</upstream>
diff --git a/media-fonts/oldstandard/metadata.xml b/media-fonts/oldstandard/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/oldstandard/metadata.xml
+++ b/media-fonts/oldstandard/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/open-sans/metadata.xml b/media-fonts/open-sans/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/open-sans/metadata.xml
+++ b/media-fonts/open-sans/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/opendesktop-fonts/metadata.xml b/media-fonts/opendesktop-fonts/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/opendesktop-fonts/metadata.xml
+++ b/media-fonts/opendesktop-fonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/oto/metadata.xml b/media-fonts/oto/metadata.xml
index f8aec25463e..59980de9efd 100644
--- a/media-fonts/oto/metadata.xml
+++ b/media-fonts/oto/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">oto</remote-id>
</upstream>
diff --git a/media-fonts/paratype/metadata.xml b/media-fonts/paratype/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/paratype/metadata.xml
+++ b/media-fonts/paratype/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/pcf2bdf/metadata.xml b/media-fonts/pcf2bdf/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/pcf2bdf/metadata.xml
+++ b/media-fonts/pcf2bdf/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/pigiarniq/metadata.xml b/media-fonts/pigiarniq/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/pigiarniq/metadata.xml
+++ b/media-fonts/pigiarniq/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/pothana2k/metadata.xml b/media-fonts/pothana2k/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/pothana2k/metadata.xml
+++ b/media-fonts/pothana2k/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/powerline-symbols/metadata.xml b/media-fonts/powerline-symbols/metadata.xml
index 4b8fd1f9b3c..561aabc26d8 100644
--- a/media-fonts/powerline-symbols/metadata.xml
+++ b/media-fonts/powerline-symbols/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">powerline/powerline</remote-id>
</upstream>
diff --git a/media-fonts/proggy-fonts/metadata.xml b/media-fonts/proggy-fonts/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/proggy-fonts/metadata.xml
+++ b/media-fonts/proggy-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/qomolangma/metadata.xml b/media-fonts/qomolangma/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/qomolangma/metadata.xml
+++ b/media-fonts/qomolangma/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/quivira/metadata.xml b/media-fonts/quivira/metadata.xml
index 328060bef94..da6bc2b968d 100644
--- a/media-fonts/quivira/metadata.xml
+++ b/media-fonts/quivira/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>fonts</herd>
<maintainer>
<email>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/ricty/metadata.xml b/media-fonts/ricty/metadata.xml
index ee46797186f..dad96b4d027 100644
--- a/media-fonts/ricty/metadata.xml
+++ b/media-fonts/ricty/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">yascentur/Ricty</remote-id>
</upstream>
diff --git a/media-fonts/roboto/metadata.xml b/media-fonts/roboto/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/roboto/metadata.xml
+++ b/media-fonts/roboto/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/sazanami/metadata.xml b/media-fonts/sazanami/metadata.xml
index 7598201f23e..6fb81686b1f 100644
--- a/media-fonts/sazanami/metadata.xml
+++ b/media-fonts/sazanami/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">efont</remote-id>
</upstream>
diff --git a/media-fonts/sgi-fonts/metadata.xml b/media-fonts/sgi-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/sgi-fonts/metadata.xml
+++ b/media-fonts/sgi-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/shinonome/metadata.xml b/media-fonts/shinonome/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/shinonome/metadata.xml
+++ b/media-fonts/shinonome/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/signika/metadata.xml b/media-fonts/signika/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/signika/metadata.xml
+++ b/media-fonts/signika/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/sil-abyssinica/metadata.xml b/media-fonts/sil-abyssinica/metadata.xml
index 8df0e887305..8eadd7ca109 100644
--- a/media-fonts/sil-abyssinica/metadata.xml
+++ b/media-fonts/sil-abyssinica/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
The Ethiopic script is used for writing many of the languages of
Ethiopia and Eritrea. Ethiopic (U+1200..U+137F) was added to
diff --git a/media-fonts/sil-arabicfonts/metadata.xml b/media-fonts/sil-arabicfonts/metadata.xml
index a2a8c2d020d..18c8b513cce 100644
--- a/media-fonts/sil-arabicfonts/metadata.xml
+++ b/media-fonts/sil-arabicfonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Scheherazade and Lateef are extended Arabic script fonts designed
by SIL International for modern Unicode-based systems using either
diff --git a/media-fonts/sil-charis/metadata.xml b/media-fonts/sil-charis/metadata.xml
index add35cda618..3d0af2a53a3 100644
--- a/media-fonts/sil-charis/metadata.xml
+++ b/media-fonts/sil-charis/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Welcome to the Charis SIL font package. Charis is similar to
Bitstream Charter, one of the first fonts designed specifically
diff --git a/media-fonts/sil-doulos/metadata.xml b/media-fonts/sil-doulos/metadata.xml
index 11ebc56ba2e..28f86f0fcdb 100644
--- a/media-fonts/sil-doulos/metadata.xml
+++ b/media-fonts/sil-doulos/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Welcome to the Doulos SIL font package. The goal for this product
was to provide a single Unicode-based font family that would
diff --git a/media-fonts/sil-ezra/metadata.xml b/media-fonts/sil-ezra/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/sil-ezra/metadata.xml
+++ b/media-fonts/sil-ezra/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/sil-galatia/metadata.xml b/media-fonts/sil-galatia/metadata.xml
index 1b783c86828..6e86cb2f098 100644
--- a/media-fonts/sil-galatia/metadata.xml
+++ b/media-fonts/sil-galatia/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Galatia SIL is the second release of a Biblical Greek font package
from SIL International. The typeface is almost identical to the
diff --git a/media-fonts/sil-gentium/metadata.xml b/media-fonts/sil-gentium/metadata.xml
index 31ca4c25637..a1f26fb01d5 100644
--- a/media-fonts/sil-gentium/metadata.xml
+++ b/media-fonts/sil-gentium/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Gentium is a typeface family designed to enable the diverse ethnic
groups around the world who use the Latin, Cyrillic and Greek
diff --git a/media-fonts/sil-padauk/metadata.xml b/media-fonts/sil-padauk/metadata.xml
index f2882005c4a..0c8f7aea900 100644
--- a/media-fonts/sil-padauk/metadata.xml
+++ b/media-fonts/sil-padauk/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription lang="en">
Padauk supports the Myanmar script extensions including changes to
how Burmese is encoded, Sgaw Karen and Mon.
diff --git a/media-fonts/sophia-nubian/metadata.xml b/media-fonts/sophia-nubian/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/sophia-nubian/metadata.xml
+++ b/media-fonts/sophia-nubian/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index c49abbde194..ecb31ee49e5 100644
--- a/media-fonts/source-han-sans/metadata.xml
+++ b/media-fonts/source-han-sans/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">adobe-fonts/source-han-sans</remote-id>
</upstream>
diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
index 81fc26191e5..0fe916dd9f8 100644
--- a/media-fonts/source-pro/metadata.xml
+++ b/media-fonts/source-pro/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>fonts</herd>
<maintainer>
<email>nirbheek@gentoo.org</email>
<name>Nirbheek Chauhan</name>
@@ -10,6 +9,10 @@
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">adobe-fonts/source-code-pro</remote-id>
<remote-id type="sourceforge">sourcesans.adobe</remote-id>
diff --git a/media-fonts/stix-fonts/metadata.xml b/media-fonts/stix-fonts/metadata.xml
index e80aa890fbb..649389b9760 100644
--- a/media-fonts/stix-fonts/metadata.xml
+++ b/media-fonts/stix-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">stixfonts</remote-id>
</upstream>
diff --git a/media-fonts/symbola/metadata.xml b/media-fonts/symbola/metadata.xml
index 328060bef94..da6bc2b968d 100644
--- a/media-fonts/symbola/metadata.xml
+++ b/media-fonts/symbola/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>fonts</herd>
<maintainer>
<email>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/takao-fonts/metadata.xml b/media-fonts/takao-fonts/metadata.xml
index b268f728f9c..f3a3748ae05 100644
--- a/media-fonts/takao-fonts/metadata.xml
+++ b/media-fonts/takao-fonts/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">takao-fonts</remote-id>
</upstream>
diff --git a/media-fonts/tengwar-fonts/metadata.xml b/media-fonts/tengwar-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/tengwar-fonts/metadata.xml
+++ b/media-fonts/tengwar-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 51c9b775d04..f4616847e20 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="a-like-o">
Changes view of letter 'a' - a looks like o (see homepage)
diff --git a/media-fonts/tex-gyre/metadata.xml b/media-fonts/tex-gyre/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/tex-gyre/metadata.xml
+++ b/media-fonts/tex-gyre/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/texcm-ttf/metadata.xml b/media-fonts/texcm-ttf/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/texcm-ttf/metadata.xml
+++ b/media-fonts/texcm-ttf/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/thaifonts-scalable/metadata.xml b/media-fonts/thaifonts-scalable/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/thaifonts-scalable/metadata.xml
+++ b/media-fonts/thaifonts-scalable/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/tibetan-machine-font/metadata.xml b/media-fonts/tibetan-machine-font/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/tibetan-machine-font/metadata.xml
+++ b/media-fonts/tibetan-machine-font/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/ttf-bitstream-vera/metadata.xml b/media-fonts/ttf-bitstream-vera/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/media-fonts/ttf-bitstream-vera/metadata.xml
+++ b/media-fonts/ttf-bitstream-vera/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/media-fonts/ubuntu-font-family/metadata.xml b/media-fonts/ubuntu-font-family/metadata.xml
index 64cc0b687d4..2e8cbd4ea62 100644
--- a/media-fonts/ubuntu-font-family/metadata.xml
+++ b/media-fonts/ubuntu-font-family/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index 8ccedd8c609..883c6dcc1a2 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mdk-ut</remote-id>
</upstream>
diff --git a/media-fonts/unfonts-extra/metadata.xml b/media-fonts/unfonts-extra/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/unfonts-extra/metadata.xml
+++ b/media-fonts/unfonts-extra/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/unfonts/metadata.xml b/media-fonts/unfonts/metadata.xml
index cdee2535d93..9c83c2a3455 100644
--- a/media-fonts/unfonts/metadata.xml
+++ b/media-fonts/unfonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
-<herd>fonts</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/unifont/metadata.xml b/media-fonts/unifont/metadata.xml
index 7e4704981b0..9b03adf0e51 100644
--- a/media-fonts/unifont/metadata.xml
+++ b/media-fonts/unifont/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>fonts</herd>
-<herd>cjk</herd>
<maintainer>
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
<use>
<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
<flag name="utils">Install unifont utilities</flag>
diff --git a/media-fonts/urw-fonts/metadata.xml b/media-fonts/urw-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/urw-fonts/metadata.xml
+++ b/media-fonts/urw-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/urwvn-fonts/metadata.xml b/media-fonts/urwvn-fonts/metadata.xml
index 0fe59e2fba0..6d37932330d 100644
--- a/media-fonts/urwvn-fonts/metadata.xml
+++ b/media-fonts/urwvn-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">vntex</remote-id>
</upstream>
diff --git a/media-fonts/vc-fonts/metadata.xml b/media-fonts/vc-fonts/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/vc-fonts/metadata.xml
+++ b/media-fonts/vc-fonts/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/vdrsymbols-ttf/metadata.xml b/media-fonts/vdrsymbols-ttf/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-fonts/vdrsymbols-ttf/metadata.xml
+++ b/media-fonts/vdrsymbols-ttf/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/media-fonts/viga/metadata.xml b/media-fonts/viga/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/viga/metadata.xml
+++ b/media-fonts/viga/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/vlgothic/metadata.xml b/media-fonts/vlgothic/metadata.xml
index c6bfaa83e0b..02074ca5dba 100644
--- a/media-fonts/vlgothic/metadata.xml
+++ b/media-fonts/vlgothic/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">vlgothic</remote-id>
</upstream>
diff --git a/media-fonts/vollkorn/metadata.xml b/media-fonts/vollkorn/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/vollkorn/metadata.xml
+++ b/media-fonts/vollkorn/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/webby-fonts/metadata.xml b/media-fonts/webby-fonts/metadata.xml
index c62efd4a8c1..09cec591d72 100644
--- a/media-fonts/webby-fonts/metadata.xml
+++ b/media-fonts/webby-fonts/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-fonts/wqy-bitmapfont/metadata.xml b/media-fonts/wqy-bitmapfont/metadata.xml
index c59d5a42643..890bfcc5632 100644
--- a/media-fonts/wqy-bitmapfont/metadata.xml
+++ b/media-fonts/wqy-bitmapfont/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription>
WenQuanYi project intends to provide the open-source community with the most
complete, standard compliant, high-quality Chinese fonts and resources. TrueType
diff --git a/media-fonts/wqy-microhei/metadata.xml b/media-fonts/wqy-microhei/metadata.xml
index 35afcbc30f0..f65218d992b 100644
--- a/media-fonts/wqy-microhei/metadata.xml
+++ b/media-fonts/wqy-microhei/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
- <herd>cjk</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wqy</remote-id>
</upstream>
diff --git a/media-fonts/wqy-unibit/metadata.xml b/media-fonts/wqy-unibit/metadata.xml
index deb09f1e749..c52a5db599b 100644
--- a/media-fonts/wqy-unibit/metadata.xml
+++ b/media-fonts/wqy-unibit/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wqy</remote-id>
</upstream>
diff --git a/media-fonts/wqy-zenhei/metadata.xml b/media-fonts/wqy-zenhei/metadata.xml
index 30ddb0f1586..de1b875b51d 100644
--- a/media-fonts/wqy-zenhei/metadata.xml
+++ b/media-fonts/wqy-zenhei/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wqy</remote-id>
</upstream>
diff --git a/media-fonts/x11fonts-jmk/metadata.xml b/media-fonts/x11fonts-jmk/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-fonts/x11fonts-jmk/metadata.xml
+++ b/media-fonts/x11fonts-jmk/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-fonts/zh-kcfonts/metadata.xml b/media-fonts/zh-kcfonts/metadata.xml
index 6e63c30f1bb..e7552514bd6 100644
--- a/media-fonts/zh-kcfonts/metadata.xml
+++ b/media-fonts/zh-kcfonts/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>