summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'virtual')
-rw-r--r--virtual/acl/metadata.xml10
-rw-r--r--virtual/ada/metadata.xml5
-rw-r--r--virtual/awk/metadata.xml7
-rw-r--r--virtual/bitcoin-leveldb/metadata.xml5
-rw-r--r--virtual/blas/metadata.xml5
-rw-r--r--virtual/cblas/metadata.xml5
-rw-r--r--virtual/cdrtools/metadata.xml1
-rw-r--r--virtual/checkpassword/metadata.xml5
-rw-r--r--virtual/commonlisp/metadata.xml5
-rw-r--r--virtual/cron/metadata.xml5
-rw-r--r--virtual/daemontools/metadata.xml5
-rw-r--r--virtual/dev-manager/metadata.xml10
-rw-r--r--virtual/editor/metadata.xml10
-rw-r--r--virtual/eject/metadata.xml5
-rw-r--r--virtual/fam/metadata.xml1
-rw-r--r--virtual/ffmpeg/metadata.xml1
-rw-r--r--virtual/fortran/metadata.xml5
-rw-r--r--virtual/freedesktop-icon-theme/metadata.xml1
-rw-r--r--virtual/glu/metadata.xml5
-rw-r--r--virtual/gnat/metadata.xml5
-rw-r--r--virtual/gnustep-back/metadata.xml5
-rw-r--r--virtual/gsasl/metadata.xml5
-rw-r--r--virtual/httpd-basic/metadata.xml5
-rw-r--r--virtual/httpd-cgi/metadata.xml5
-rw-r--r--virtual/httpd-fastcgi/metadata.xml5
-rw-r--r--virtual/httpd-php/metadata.xml5
-rw-r--r--virtual/imap-c-client/metadata.xml5
-rw-r--r--virtual/inetd/metadata.xml5
-rw-r--r--virtual/jdk/metadata.xml5
-rw-r--r--virtual/jpeg/metadata.xml5
-rw-r--r--virtual/jre/metadata.xml5
-rw-r--r--virtual/krb5/metadata.xml5
-rw-r--r--virtual/lapack/metadata.xml5
-rw-r--r--virtual/latex-base/metadata.xml5
-rw-r--r--virtual/leechcraft-browser/metadata.xml5
-rw-r--r--virtual/leechcraft-downloader-http/metadata.xml5
-rw-r--r--virtual/leechcraft-notifier/metadata.xml5
-rw-r--r--virtual/leechcraft-quark-sideprovider/metadata.xml5
-rw-r--r--virtual/leechcraft-search-show/metadata.xml5
-rw-r--r--virtual/leechcraft-storage-device-manager/metadata.xml5
-rw-r--r--virtual/leechcraft-task-show/metadata.xml5
-rw-r--r--virtual/leechcraft-trayarea/metadata.xml5
-rw-r--r--virtual/leechcraft-wysiwyg-editor/metadata.xml5
-rw-r--r--virtual/libc/metadata.xml15
-rw-r--r--virtual/libffi/metadata.xml5
-rw-r--r--virtual/libmysqlclient/metadata.xml5
-rw-r--r--virtual/libstdc++/metadata.xml5
-rw-r--r--virtual/libusb/metadata.xml10
-rw-r--r--virtual/linux-sources/metadata.xml5
-rw-r--r--virtual/linuxtv-dvb-headers/metadata.xml1
-rw-r--r--virtual/logger/metadata.xml5
-rw-r--r--virtual/mailx/metadata.xml5
-rw-r--r--virtual/man/metadata.xml5
-rw-r--r--virtual/mda/metadata.xml10
-rw-r--r--virtual/modutils/metadata.xml7
-rw-r--r--virtual/mpi/metadata.xml5
-rw-r--r--virtual/mta/metadata.xml10
-rw-r--r--virtual/mysql/metadata.xml5
-rw-r--r--virtual/notification-daemon/metadata.xml1
-rw-r--r--virtual/ooo/metadata.xml5
-rw-r--r--virtual/opencl/metadata.xml5
-rw-r--r--virtual/opengl/metadata.xml5
-rw-r--r--virtual/os-headers/metadata.xml10
-rw-r--r--virtual/package-manager/metadata.xml5
-rw-r--r--virtual/pam/metadata.xml1
-rw-r--r--virtual/perl-Archive-Tar/metadata.xml5
-rw-r--r--virtual/perl-Attribute-Handlers/metadata.xml5
-rw-r--r--virtual/perl-AutoLoader/metadata.xml5
-rw-r--r--virtual/perl-B-Debug/metadata.xml5
-rw-r--r--virtual/perl-CPAN-Meta-Requirements/metadata.xml5
-rw-r--r--virtual/perl-CPAN-Meta-YAML/metadata.xml5
-rw-r--r--virtual/perl-CPAN-Meta/metadata.xml5
-rw-r--r--virtual/perl-CPAN/metadata.xml5
-rw-r--r--virtual/perl-Carp/metadata.xml5
-rw-r--r--virtual/perl-Compress-Raw-Bzip2/metadata.xml5
-rw-r--r--virtual/perl-Compress-Raw-Zlib/metadata.xml5
-rw-r--r--virtual/perl-DB_File/metadata.xml5
-rw-r--r--virtual/perl-Data-Dumper/metadata.xml5
-rw-r--r--virtual/perl-Devel-PPPort/metadata.xml5
-rw-r--r--virtual/perl-Digest-MD5/metadata.xml5
-rw-r--r--virtual/perl-Digest-SHA/metadata.xml5
-rw-r--r--virtual/perl-Digest/metadata.xml5
-rw-r--r--virtual/perl-Dumpvalue/metadata.xml5
-rw-r--r--virtual/perl-Encode/metadata.xml5
-rw-r--r--virtual/perl-Exporter/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-CBuilder/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-Command/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-Constant/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-Install/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-MakeMaker/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-Manifest/metadata.xml5
-rw-r--r--virtual/perl-ExtUtils-ParseXS/metadata.xml5
-rw-r--r--virtual/perl-File-Path/metadata.xml5
-rw-r--r--virtual/perl-File-Spec/metadata.xml5
-rw-r--r--virtual/perl-File-Temp/metadata.xml5
-rw-r--r--virtual/perl-Filter-Simple/metadata.xml5
-rw-r--r--virtual/perl-Getopt-Long/metadata.xml5
-rw-r--r--virtual/perl-HTTP-Tiny/metadata.xml5
-rw-r--r--virtual/perl-I18N-LangTags/metadata.xml5
-rw-r--r--virtual/perl-IO-Compress/metadata.xml5
-rw-r--r--virtual/perl-IO-Socket-IP/metadata.xml5
-rw-r--r--virtual/perl-IO-Zlib/metadata.xml5
-rw-r--r--virtual/perl-IO/metadata.xml5
-rw-r--r--virtual/perl-IPC-Cmd/metadata.xml5
-rw-r--r--virtual/perl-JSON-PP/metadata.xml5
-rw-r--r--virtual/perl-Locale-Maketext-Simple/metadata.xml5
-rw-r--r--virtual/perl-Locale-Maketext/metadata.xml5
-rw-r--r--virtual/perl-MIME-Base64/metadata.xml5
-rw-r--r--virtual/perl-Math-BigInt-FastCalc/metadata.xml5
-rw-r--r--virtual/perl-Math-BigInt/metadata.xml5
-rw-r--r--virtual/perl-Math-BigRat/metadata.xml5
-rw-r--r--virtual/perl-Math-Complex/metadata.xml5
-rw-r--r--virtual/perl-Memoize/metadata.xml5
-rw-r--r--virtual/perl-Module-CoreList/metadata.xml5
-rw-r--r--virtual/perl-Module-Load-Conditional/metadata.xml5
-rw-r--r--virtual/perl-Module-Load/metadata.xml5
-rw-r--r--virtual/perl-Module-Loaded/metadata.xml5
-rw-r--r--virtual/perl-Module-Metadata/metadata.xml5
-rw-r--r--virtual/perl-Net-Ping/metadata.xml5
-rw-r--r--virtual/perl-Package-Constants/metadata.xml5
-rw-r--r--virtual/perl-Params-Check/metadata.xml5
-rw-r--r--virtual/perl-Parse-CPAN-Meta/metadata.xml5
-rw-r--r--virtual/perl-Perl-OSType/metadata.xml5
-rw-r--r--virtual/perl-Pod-Escapes/metadata.xml5
-rw-r--r--virtual/perl-Pod-Parser/metadata.xml5
-rw-r--r--virtual/perl-Pod-Simple/metadata.xml5
-rw-r--r--virtual/perl-Safe/metadata.xml5
-rw-r--r--virtual/perl-Scalar-List-Utils/metadata.xml5
-rw-r--r--virtual/perl-Socket/metadata.xml5
-rw-r--r--virtual/perl-Storable/metadata.xml5
-rw-r--r--virtual/perl-Sys-Syslog/metadata.xml5
-rw-r--r--virtual/perl-Term-ANSIColor/metadata.xml5
-rw-r--r--virtual/perl-Term-ReadLine/metadata.xml5
-rw-r--r--virtual/perl-Test-Harness/metadata.xml5
-rw-r--r--virtual/perl-Test-Simple/metadata.xml5
-rw-r--r--virtual/perl-Test/metadata.xml5
-rw-r--r--virtual/perl-Text-Balanced/metadata.xml5
-rw-r--r--virtual/perl-Text-ParseWords/metadata.xml5
-rw-r--r--virtual/perl-Text-Tabs+Wrap/metadata.xml5
-rw-r--r--virtual/perl-Thread-Queue/metadata.xml5
-rw-r--r--virtual/perl-Thread-Semaphore/metadata.xml5
-rw-r--r--virtual/perl-Tie-RefHash/metadata.xml5
-rw-r--r--virtual/perl-Time-HiRes/metadata.xml5
-rw-r--r--virtual/perl-Time-Local/metadata.xml5
-rw-r--r--virtual/perl-Time-Piece/metadata.xml5
-rw-r--r--virtual/perl-Unicode-Collate/metadata.xml5
-rw-r--r--virtual/perl-Unicode-Normalize/metadata.xml5
-rw-r--r--virtual/perl-XSLoader/metadata.xml5
-rw-r--r--virtual/perl-autodie/metadata.xml5
-rw-r--r--virtual/perl-bignum/metadata.xml5
-rw-r--r--virtual/perl-if/metadata.xml5
-rw-r--r--virtual/perl-libnet/metadata.xml5
-rw-r--r--virtual/perl-parent/metadata.xml5
-rw-r--r--virtual/perl-podlators/metadata.xml5
-rw-r--r--virtual/perl-threads-shared/metadata.xml5
-rw-r--r--virtual/perl-threads/metadata.xml5
-rw-r--r--virtual/perl-version/metadata.xml5
-rw-r--r--virtual/pkgconfig/metadata.xml10
-rw-r--r--virtual/pmake/metadata.xml5
-rw-r--r--virtual/pypy/metadata.xml5
-rw-r--r--virtual/pypy3/metadata.xml5
-rw-r--r--virtual/python-asyncio/metadata.xml5
-rw-r--r--virtual/python-backports_abc/metadata.xml5
-rw-r--r--virtual/python-dnspython/metadata.xml5
-rw-r--r--virtual/python-funcsigs/metadata.xml5
-rw-r--r--virtual/python-futures/metadata.xml5
-rw-r--r--virtual/python-greenlet/metadata.xml5
-rw-r--r--virtual/python-imaging/metadata.xml5
-rw-r--r--virtual/python-ipaddress/metadata.xml5
-rw-r--r--virtual/python-pathlib/metadata.xml5
-rw-r--r--virtual/python-pmw/metadata.xml5
-rw-r--r--virtual/qmail/metadata.xml5
-rw-r--r--virtual/ruby-ffi/metadata.xml5
-rw-r--r--virtual/ruby-minitest/metadata.xml5
-rw-r--r--virtual/ruby-ssl/metadata.xml5
-rw-r--r--virtual/ruby/metadata.xml5
-rw-r--r--virtual/rubygems/metadata.xml5
-rw-r--r--virtual/service-manager/metadata.xml5
-rw-r--r--virtual/shadow/metadata.xml5
-rw-r--r--virtual/skkserv/metadata.xml5
-rw-r--r--virtual/ssh/metadata.xml10
-rw-r--r--virtual/tex-base/metadata.xml5
-rw-r--r--virtual/texi2dvi/metadata.xml10
-rw-r--r--virtual/ttf-fonts/metadata.xml5
-rw-r--r--virtual/w3m/metadata.xml5
-rw-r--r--virtual/yacc/metadata.xml5
186 files changed, 766 insertions, 200 deletions
diff --git a/virtual/acl/metadata.xml b/virtual/acl/metadata.xml
index c6e0a013acb4..5bb2fcc31636 100644
--- a/virtual/acl/metadata.xml
+++ b/virtual/acl/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>bsd</herd>
-<herd>base-system</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/ada/metadata.xml b/virtual/ada/metadata.xml
index aec150231c3f..faafba5cf197 100644
--- a/virtual/ada/metadata.xml
+++ b/virtual/ada/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>ada</herd>
+<maintainer>
+ <email>ada@gentoo.org</email>
+ <name>Gentoo Resources for Ada</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
index 4651ee5209cd..0b8888c2d9df 100644
--- a/virtual/awk/metadata.xml
+++ b/virtual/awk/metadata.xml
@@ -5,5 +5,8 @@
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
- <herd>base-system</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/virtual/bitcoin-leveldb/metadata.xml b/virtual/bitcoin-leveldb/metadata.xml
index f258144be6d6..0e19f0e2cefc 100644
--- a/virtual/bitcoin-leveldb/metadata.xml
+++ b/virtual/bitcoin-leveldb/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml
index 33c1a1a050cf..15556618f601 100644
--- a/virtual/blas/metadata.xml
+++ b/virtual/blas/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</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Gentoo virtual package for the Basic Linear Algebra Subprograms
FORTRAN 77 implementation.
diff --git a/virtual/cblas/metadata.xml b/virtual/cblas/metadata.xml
index 7de36ad23410..0331cd933f8c 100644
--- a/virtual/cblas/metadata.xml
+++ b/virtual/cblas/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</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Gentoo virtual package for the Basic Linear Algebra Subprograms
C implementation.
diff --git a/virtual/cdrtools/metadata.xml b/virtual/cdrtools/metadata.xml
index bb93fa2613e7..097975e3adc2 100644
--- a/virtual/cdrtools/metadata.xml
+++ b/virtual/cdrtools/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-optical</herd>
</pkgmetadata>
diff --git a/virtual/checkpassword/metadata.xml b/virtual/checkpassword/metadata.xml
index 210ce3ffc25e..5f39b000ab6f 100644
--- a/virtual/checkpassword/metadata.xml
+++ b/virtual/checkpassword/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>qmail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/commonlisp/metadata.xml b/virtual/commonlisp/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/virtual/commonlisp/metadata.xml
+++ b/virtual/commonlisp/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>common-lisp</herd>
+<maintainer>
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/cron/metadata.xml b/virtual/cron/metadata.xml
index 1d9cbae7f82a..161419e28f2f 100644
--- a/virtual/cron/metadata.xml
+++ b/virtual/cron/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>cron</herd>
+<maintainer>
+ <email>cron-bugs@gentoo.org</email>
+ <name>Gentoo Cron Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/daemontools/metadata.xml b/virtual/daemontools/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/virtual/daemontools/metadata.xml
+++ b/virtual/daemontools/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>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/dev-manager/metadata.xml b/virtual/dev-manager/metadata.xml
index cbc72fcf8f85..35d581cbe1a9 100644
--- a/virtual/dev-manager/metadata.xml
+++ b/virtual/dev-manager/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>base-system</herd>
-<herd>bsd</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index d3514926a04f..0121a4259a4b 100644
--- a/virtual/editor/metadata.xml
+++ b/virtual/editor/metadata.xml
@@ -5,6 +5,12 @@
<email>emacs@gentoo.org</email>
<name>Gentoo Emacs project</name>
</maintainer>
-<herd>vim</herd>
-<herd>base-system</herd>
+<maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/eject/metadata.xml b/virtual/eject/metadata.xml
index bee9f9ae6f02..aff39ca735f4 100644
--- a/virtual/eject/metadata.xml
+++ b/virtual/eject/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>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/fam/metadata.xml b/virtual/fam/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/virtual/fam/metadata.xml
+++ b/virtual/fam/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/virtual/ffmpeg/metadata.xml b/virtual/ffmpeg/metadata.xml
index 4ca5bff578d8..9f31709f5980 100644
--- a/virtual/ffmpeg/metadata.xml
+++ b/virtual/ffmpeg/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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/virtual/fortran/metadata.xml b/virtual/fortran/metadata.xml
index 11f39a4c56de..49e6e5667464 100644
--- a/virtual/fortran/metadata.xml
+++ b/virtual/fortran/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription>Use this package, if you package needs a fortran compiler</longdescription>
</pkgmetadata>
diff --git a/virtual/freedesktop-icon-theme/metadata.xml b/virtual/freedesktop-icon-theme/metadata.xml
index 00b0f88611bb..5f0f076e0adc 100644
--- a/virtual/freedesktop-icon-theme/metadata.xml
+++ b/virtual/freedesktop-icon-theme/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/virtual/glu/metadata.xml b/virtual/glu/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/glu/metadata.xml
+++ b/virtual/glu/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/virtual/gnat/metadata.xml b/virtual/gnat/metadata.xml
index aec150231c3f..faafba5cf197 100644
--- a/virtual/gnat/metadata.xml
+++ b/virtual/gnat/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>ada</herd>
+<maintainer>
+ <email>ada@gentoo.org</email>
+ <name>Gentoo Resources for Ada</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/gnustep-back/metadata.xml b/virtual/gnustep-back/metadata.xml
index 2a3592e1557a..ebe04e99b209 100644
--- a/virtual/gnustep-back/metadata.xml
+++ b/virtual/gnustep-back/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>gnustep</herd>
+<maintainer>
+ <email>gnustep@gentoo.org</email>
+ <name>Gentoo GNUstep Project</name>
+</maintainer>
<longdescription>
This virtual provides a gnustep back-end component for the GNUstep
GUI Library.
diff --git a/virtual/gsasl/metadata.xml b/virtual/gsasl/metadata.xml
index 940fde8f70ce..cf7950eb8559 100644
--- a/virtual/gsasl/metadata.xml
+++ b/virtual/gsasl/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/httpd-basic/metadata.xml b/virtual/httpd-basic/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-basic/metadata.xml
+++ b/virtual/httpd-basic/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/httpd-cgi/metadata.xml b/virtual/httpd-cgi/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-cgi/metadata.xml
+++ b/virtual/httpd-cgi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/httpd-fastcgi/metadata.xml b/virtual/httpd-fastcgi/metadata.xml
index 6632069b5aff..0496fdd3267f 100644
--- a/virtual/httpd-fastcgi/metadata.xml
+++ b/virtual/httpd-fastcgi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/httpd-php/metadata.xml b/virtual/httpd-php/metadata.xml
index 40dbb4c4bbaf..45a82f47e178 100644
--- a/virtual/httpd-php/metadata.xml
+++ b/virtual/httpd-php/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>php</herd>
+<maintainer>
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/imap-c-client/metadata.xml b/virtual/imap-c-client/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/virtual/imap-c-client/metadata.xml
+++ b/virtual/imap-c-client/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/inetd/metadata.xml b/virtual/inetd/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/inetd/metadata.xml
+++ b/virtual/inetd/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/virtual/jdk/metadata.xml
+++ b/virtual/jdk/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>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index 07d7201f38a3..24cc09b4194c 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<slots>
<slot name="0">For building against. This is the only slot
that provides headers and command line tools.</slot>
diff --git a/virtual/jre/metadata.xml b/virtual/jre/metadata.xml
index 7303cef96964..b424f92446a4 100644
--- a/virtual/jre/metadata.xml
+++ b/virtual/jre/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>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/krb5/metadata.xml b/virtual/krb5/metadata.xml
index 5ae9375e9391..2a1e1d958528 100644
--- a/virtual/krb5/metadata.xml
+++ b/virtual/krb5/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>kerberos</herd>
+<maintainer>
+ <email>kerberos@gentoo.org</email>
+ <name>Kerberos</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/lapack/metadata.xml b/virtual/lapack/metadata.xml
index a61311fc5cae..7e3064b79795 100644
--- a/virtual/lapack/metadata.xml
+++ b/virtual/lapack/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</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Gentoo virtual package for the Linear Algebra PACKAge
FORTRAN 77 implementation.
diff --git a/virtual/latex-base/metadata.xml b/virtual/latex-base/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/virtual/latex-base/metadata.xml
+++ b/virtual/latex-base/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-browser/metadata.xml b/virtual/leechcraft-browser/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-browser/metadata.xml
+++ b/virtual/leechcraft-browser/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-downloader-http/metadata.xml b/virtual/leechcraft-downloader-http/metadata.xml
index 12f1722f7fcc..21daabd5b959 100644
--- a/virtual/leechcraft-downloader-http/metadata.xml
+++ b/virtual/leechcraft-downloader-http/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>leechcraft</herd>
+<maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-notifier/metadata.xml b/virtual/leechcraft-notifier/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-notifier/metadata.xml
+++ b/virtual/leechcraft-notifier/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-quark-sideprovider/metadata.xml b/virtual/leechcraft-quark-sideprovider/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-quark-sideprovider/metadata.xml
+++ b/virtual/leechcraft-quark-sideprovider/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-search-show/metadata.xml b/virtual/leechcraft-search-show/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-search-show/metadata.xml
+++ b/virtual/leechcraft-search-show/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-storage-device-manager/metadata.xml b/virtual/leechcraft-storage-device-manager/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-storage-device-manager/metadata.xml
+++ b/virtual/leechcraft-storage-device-manager/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-task-show/metadata.xml b/virtual/leechcraft-task-show/metadata.xml
index 3205dcc72f2f..085b7b403c61 100644
--- a/virtual/leechcraft-task-show/metadata.xml
+++ b/virtual/leechcraft-task-show/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+</maintainer>
<longdescription>Virtual for plugins that can show IDownloads and IJobHolders</longdescription>
</pkgmetadata>
diff --git a/virtual/leechcraft-trayarea/metadata.xml b/virtual/leechcraft-trayarea/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-trayarea/metadata.xml
+++ b/virtual/leechcraft-trayarea/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/leechcraft-wysiwyg-editor/metadata.xml b/virtual/leechcraft-wysiwyg-editor/metadata.xml
index 2c857dda08d3..0ba5233d2821 100644
--- a/virtual/leechcraft-wysiwyg-editor/metadata.xml
+++ b/virtual/leechcraft-wysiwyg-editor/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/libc/metadata.xml b/virtual/libc/metadata.xml
index 7b307f749fbf..c34aedf5d947 100644
--- a/virtual/libc/metadata.xml
+++ b/virtual/libc/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>toolchain</herd>
-<herd>embedded</herd>
-<herd>bsd</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/libffi/metadata.xml b/virtual/libffi/metadata.xml
index 686dc818edb9..0c0a20a0e663 100644
--- a/virtual/libffi/metadata.xml
+++ b/virtual/libffi/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>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/libmysqlclient/metadata.xml b/virtual/libmysqlclient/metadata.xml
index 362521e5bdf9..26e49be10177 100644
--- a/virtual/libmysqlclient/metadata.xml
+++ b/virtual/libmysqlclient/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>mysql</herd>
+ <maintainer>
+ <email>mysql-bugs@gentoo.org</email>
+ <name>MySQL</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/libstdc++/metadata.xml b/virtual/libstdc++/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/virtual/libstdc++/metadata.xml
+++ b/virtual/libstdc++/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>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/libusb/metadata.xml b/virtual/libusb/metadata.xml
index bff000f363b9..a4a5931b2beb 100644
--- a/virtual/libusb/metadata.xml
+++ b/virtual/libusb/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>peter@stuge.se</email>
<name>Peter Stuge</name>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/linux-sources/metadata.xml b/virtual/linux-sources/metadata.xml
index cc291a71f989..96c5ffcb8d81 100644
--- a/virtual/linux-sources/metadata.xml
+++ b/virtual/linux-sources/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>kernel</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>kernel@gentoo.org</email>
+ <name>Gentoo Kernel Project</name>
+ </maintainer>
<use>
<flag name="firmware">Install linux kernel firmware</flag>
</use>
diff --git a/virtual/linuxtv-dvb-headers/metadata.xml b/virtual/linuxtv-dvb-headers/metadata.xml
index fab1ebd6abea..d3b8269574ea 100644
--- a/virtual/linuxtv-dvb-headers/metadata.xml
+++ b/virtual/linuxtv-dvb-headers/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>
<longdescription>
This package contains the header files for the DVB drivers
from linuxtv.org needed to compile any application
diff --git a/virtual/logger/metadata.xml b/virtual/logger/metadata.xml
index e31cecb196d6..f6a0271326a3 100644
--- a/virtual/logger/metadata.xml
+++ b/virtual/logger/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>base-system</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/mailx/metadata.xml b/virtual/mailx/metadata.xml
index 51f94e3fbe0e..5f39b000ab6f 100644
--- a/virtual/mailx/metadata.xml
+++ b/virtual/mailx/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/man/metadata.xml b/virtual/man/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/man/metadata.xml
+++ b/virtual/man/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/mda/metadata.xml b/virtual/mda/metadata.xml
index 10fe7e71ff8b..138967b70aea 100644
--- a/virtual/mda/metadata.xml
+++ b/virtual/mda/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>net-mail</herd>
-<herd>qmail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/modutils/metadata.xml b/virtual/modutils/metadata.xml
index 14f8165f0c15..264f86b10bb2 100644
--- a/virtual/modutils/metadata.xml
+++ b/virtual/modutils/metadata.xml
@@ -4,5 +4,8 @@
<maintainer>
<email>udev-bugs@gentoo.org</email>
</maintainer>
- <herd>base-system</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/virtual/mpi/metadata.xml b/virtual/mpi/metadata.xml
index 68315d1453b8..892427e7a9cd 100644
--- a/virtual/mpi/metadata.xml
+++ b/virtual/mpi/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>cluster</herd>
+ <maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
<use>
<flag name="romio">Enable romio, a high-performance portable MPI-IO</flag>
</use>
diff --git a/virtual/mta/metadata.xml b/virtual/mta/metadata.xml
index 10fe7e71ff8b..138967b70aea 100644
--- a/virtual/mta/metadata.xml
+++ b/virtual/mta/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>net-mail</herd>
-<herd>qmail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
index 2624f382a321..d19367d51a8c 100644
--- a/virtual/mysql/metadata.xml
+++ b/virtual/mysql/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>mysql</herd>
+ <maintainer>
+ <email>mysql-bugs@gentoo.org</email>
+ <name>MySQL</name>
+ </maintainer>
<use>
<flag name="embedded">Build embedded server (libmysqld)</flag>
</use>
diff --git a/virtual/notification-daemon/metadata.xml b/virtual/notification-daemon/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/virtual/notification-daemon/metadata.xml
+++ b/virtual/notification-daemon/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/virtual/ooo/metadata.xml b/virtual/ooo/metadata.xml
index 254a397ff975..6766c67a7ae2 100644
--- a/virtual/ooo/metadata.xml
+++ b/virtual/ooo/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>office</herd>
+<maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/opencl/metadata.xml b/virtual/opencl/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/opencl/metadata.xml
+++ b/virtual/opencl/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/virtual/opengl/metadata.xml b/virtual/opengl/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/virtual/opengl/metadata.xml
+++ b/virtual/opengl/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/virtual/os-headers/metadata.xml b/virtual/os-headers/metadata.xml
index 73b74513bca0..eccf2b3edc9a 100644
--- a/virtual/os-headers/metadata.xml
+++ b/virtual/os-headers/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>toolchain</herd>
-<herd>bsd</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/package-manager/metadata.xml b/virtual/package-manager/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/package-manager/metadata.xml
+++ b/virtual/package-manager/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/pam/metadata.xml b/virtual/pam/metadata.xml
index f8e763f016bf..b6f392af5fe6 100644
--- a/virtual/pam/metadata.xml
+++ b/virtual/pam/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>pam</herd>
<maintainer>
<email>pam-bugs@gentoo.org</email>
</maintainer>
diff --git a/virtual/perl-Archive-Tar/metadata.xml b/virtual/perl-Archive-Tar/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Archive-Tar/metadata.xml
+++ b/virtual/perl-Archive-Tar/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Attribute-Handlers/metadata.xml b/virtual/perl-Attribute-Handlers/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Attribute-Handlers/metadata.xml
+++ b/virtual/perl-Attribute-Handlers/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-AutoLoader/metadata.xml b/virtual/perl-AutoLoader/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-AutoLoader/metadata.xml
+++ b/virtual/perl-AutoLoader/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-B-Debug/metadata.xml b/virtual/perl-B-Debug/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-B-Debug/metadata.xml
+++ b/virtual/perl-B-Debug/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta-Requirements/metadata.xml b/virtual/perl-CPAN-Meta-Requirements/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta-Requirements/metadata.xml
+++ b/virtual/perl-CPAN-Meta-Requirements/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta-YAML/metadata.xml b/virtual/perl-CPAN-Meta-YAML/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta-YAML/metadata.xml
+++ b/virtual/perl-CPAN-Meta-YAML/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-CPAN-Meta/metadata.xml b/virtual/perl-CPAN-Meta/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN-Meta/metadata.xml
+++ b/virtual/perl-CPAN-Meta/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-CPAN/metadata.xml b/virtual/perl-CPAN/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-CPAN/metadata.xml
+++ b/virtual/perl-CPAN/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Carp/metadata.xml b/virtual/perl-Carp/metadata.xml
index 1027ac9b1094..121d3972ee8c 100644
--- a/virtual/perl-Carp/metadata.xml
+++ b/virtual/perl-Carp/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>perl</herd>
<maintainer>
<email>kentfredric@gmail.com</email>
<name>Kent Fredric</name>
</maintainer>
+<maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Compress-Raw-Bzip2/metadata.xml b/virtual/perl-Compress-Raw-Bzip2/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Compress-Raw-Bzip2/metadata.xml
+++ b/virtual/perl-Compress-Raw-Bzip2/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Compress-Raw-Zlib/metadata.xml b/virtual/perl-Compress-Raw-Zlib/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Compress-Raw-Zlib/metadata.xml
+++ b/virtual/perl-Compress-Raw-Zlib/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-DB_File/metadata.xml b/virtual/perl-DB_File/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-DB_File/metadata.xml
+++ b/virtual/perl-DB_File/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Data-Dumper/metadata.xml b/virtual/perl-Data-Dumper/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Data-Dumper/metadata.xml
+++ b/virtual/perl-Data-Dumper/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Devel-PPPort/metadata.xml b/virtual/perl-Devel-PPPort/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Devel-PPPort/metadata.xml
+++ b/virtual/perl-Devel-PPPort/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Digest-MD5/metadata.xml b/virtual/perl-Digest-MD5/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest-MD5/metadata.xml
+++ b/virtual/perl-Digest-MD5/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Digest-SHA/metadata.xml b/virtual/perl-Digest-SHA/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest-SHA/metadata.xml
+++ b/virtual/perl-Digest-SHA/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Digest/metadata.xml b/virtual/perl-Digest/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Digest/metadata.xml
+++ b/virtual/perl-Digest/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Dumpvalue/metadata.xml b/virtual/perl-Dumpvalue/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Dumpvalue/metadata.xml
+++ b/virtual/perl-Dumpvalue/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Encode/metadata.xml b/virtual/perl-Encode/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Encode/metadata.xml
+++ b/virtual/perl-Encode/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Exporter/metadata.xml b/virtual/perl-Exporter/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Exporter/metadata.xml
+++ b/virtual/perl-Exporter/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-CBuilder/metadata.xml b/virtual/perl-ExtUtils-CBuilder/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-ExtUtils-CBuilder/metadata.xml
+++ b/virtual/perl-ExtUtils-CBuilder/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Command/metadata.xml b/virtual/perl-ExtUtils-Command/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Command/metadata.xml
+++ b/virtual/perl-ExtUtils-Command/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Constant/metadata.xml b/virtual/perl-ExtUtils-Constant/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Constant/metadata.xml
+++ b/virtual/perl-ExtUtils-Constant/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Install/metadata.xml b/virtual/perl-ExtUtils-Install/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Install/metadata.xml
+++ b/virtual/perl-ExtUtils-Install/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-MakeMaker/metadata.xml b/virtual/perl-ExtUtils-MakeMaker/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-MakeMaker/metadata.xml
+++ b/virtual/perl-ExtUtils-MakeMaker/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-Manifest/metadata.xml b/virtual/perl-ExtUtils-Manifest/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-ExtUtils-Manifest/metadata.xml
+++ b/virtual/perl-ExtUtils-Manifest/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-ExtUtils-ParseXS/metadata.xml b/virtual/perl-ExtUtils-ParseXS/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-ExtUtils-ParseXS/metadata.xml
+++ b/virtual/perl-ExtUtils-ParseXS/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-File-Path/metadata.xml b/virtual/perl-File-Path/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-File-Path/metadata.xml
+++ b/virtual/perl-File-Path/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-File-Spec/metadata.xml b/virtual/perl-File-Spec/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-File-Spec/metadata.xml
+++ b/virtual/perl-File-Spec/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-File-Temp/metadata.xml b/virtual/perl-File-Temp/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-File-Temp/metadata.xml
+++ b/virtual/perl-File-Temp/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Filter-Simple/metadata.xml b/virtual/perl-Filter-Simple/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Filter-Simple/metadata.xml
+++ b/virtual/perl-Filter-Simple/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Getopt-Long/metadata.xml b/virtual/perl-Getopt-Long/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Getopt-Long/metadata.xml
+++ b/virtual/perl-Getopt-Long/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-HTTP-Tiny/metadata.xml b/virtual/perl-HTTP-Tiny/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-HTTP-Tiny/metadata.xml
+++ b/virtual/perl-HTTP-Tiny/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-I18N-LangTags/metadata.xml b/virtual/perl-I18N-LangTags/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-I18N-LangTags/metadata.xml
+++ b/virtual/perl-I18N-LangTags/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-IO-Compress/metadata.xml b/virtual/perl-IO-Compress/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IO-Compress/metadata.xml
+++ b/virtual/perl-IO-Compress/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-IO-Socket-IP/metadata.xml b/virtual/perl-IO-Socket-IP/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IO-Socket-IP/metadata.xml
+++ b/virtual/perl-IO-Socket-IP/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-IO-Zlib/metadata.xml b/virtual/perl-IO-Zlib/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-IO-Zlib/metadata.xml
+++ b/virtual/perl-IO-Zlib/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-IO/metadata.xml b/virtual/perl-IO/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-IO/metadata.xml
+++ b/virtual/perl-IO/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-IPC-Cmd/metadata.xml b/virtual/perl-IPC-Cmd/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-IPC-Cmd/metadata.xml
+++ b/virtual/perl-IPC-Cmd/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-JSON-PP/metadata.xml b/virtual/perl-JSON-PP/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-JSON-PP/metadata.xml
+++ b/virtual/perl-JSON-PP/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Locale-Maketext-Simple/metadata.xml b/virtual/perl-Locale-Maketext-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Locale-Maketext-Simple/metadata.xml
+++ b/virtual/perl-Locale-Maketext-Simple/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Locale-Maketext/metadata.xml b/virtual/perl-Locale-Maketext/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Locale-Maketext/metadata.xml
+++ b/virtual/perl-Locale-Maketext/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-MIME-Base64/metadata.xml b/virtual/perl-MIME-Base64/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-MIME-Base64/metadata.xml
+++ b/virtual/perl-MIME-Base64/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Math-BigInt-FastCalc/metadata.xml b/virtual/perl-Math-BigInt-FastCalc/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigInt-FastCalc/metadata.xml
+++ b/virtual/perl-Math-BigInt-FastCalc/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Math-BigInt/metadata.xml b/virtual/perl-Math-BigInt/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigInt/metadata.xml
+++ b/virtual/perl-Math-BigInt/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Math-BigRat/metadata.xml b/virtual/perl-Math-BigRat/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Math-BigRat/metadata.xml
+++ b/virtual/perl-Math-BigRat/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Math-Complex/metadata.xml b/virtual/perl-Math-Complex/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Math-Complex/metadata.xml
+++ b/virtual/perl-Math-Complex/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Memoize/metadata.xml b/virtual/perl-Memoize/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Memoize/metadata.xml
+++ b/virtual/perl-Memoize/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Module-CoreList/metadata.xml b/virtual/perl-Module-CoreList/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Module-CoreList/metadata.xml
+++ b/virtual/perl-Module-CoreList/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Module-Load-Conditional/metadata.xml b/virtual/perl-Module-Load-Conditional/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Load-Conditional/metadata.xml
+++ b/virtual/perl-Module-Load-Conditional/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Module-Load/metadata.xml b/virtual/perl-Module-Load/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Load/metadata.xml
+++ b/virtual/perl-Module-Load/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Module-Loaded/metadata.xml b/virtual/perl-Module-Loaded/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Loaded/metadata.xml
+++ b/virtual/perl-Module-Loaded/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Module-Metadata/metadata.xml b/virtual/perl-Module-Metadata/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Module-Metadata/metadata.xml
+++ b/virtual/perl-Module-Metadata/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Net-Ping/metadata.xml b/virtual/perl-Net-Ping/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Net-Ping/metadata.xml
+++ b/virtual/perl-Net-Ping/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Package-Constants/metadata.xml b/virtual/perl-Package-Constants/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Package-Constants/metadata.xml
+++ b/virtual/perl-Package-Constants/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Params-Check/metadata.xml b/virtual/perl-Params-Check/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Params-Check/metadata.xml
+++ b/virtual/perl-Params-Check/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Parse-CPAN-Meta/metadata.xml b/virtual/perl-Parse-CPAN-Meta/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Parse-CPAN-Meta/metadata.xml
+++ b/virtual/perl-Parse-CPAN-Meta/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Perl-OSType/metadata.xml b/virtual/perl-Perl-OSType/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Perl-OSType/metadata.xml
+++ b/virtual/perl-Perl-OSType/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Pod-Escapes/metadata.xml b/virtual/perl-Pod-Escapes/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Escapes/metadata.xml
+++ b/virtual/perl-Pod-Escapes/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Pod-Parser/metadata.xml b/virtual/perl-Pod-Parser/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Parser/metadata.xml
+++ b/virtual/perl-Pod-Parser/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Pod-Simple/metadata.xml b/virtual/perl-Pod-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Pod-Simple/metadata.xml
+++ b/virtual/perl-Pod-Simple/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Safe/metadata.xml b/virtual/perl-Safe/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Safe/metadata.xml
+++ b/virtual/perl-Safe/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Scalar-List-Utils/metadata.xml b/virtual/perl-Scalar-List-Utils/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Scalar-List-Utils/metadata.xml
+++ b/virtual/perl-Scalar-List-Utils/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Socket/metadata.xml b/virtual/perl-Socket/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-Socket/metadata.xml
+++ b/virtual/perl-Socket/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Storable/metadata.xml b/virtual/perl-Storable/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Storable/metadata.xml
+++ b/virtual/perl-Storable/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Sys-Syslog/metadata.xml b/virtual/perl-Sys-Syslog/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Sys-Syslog/metadata.xml
+++ b/virtual/perl-Sys-Syslog/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Term-ANSIColor/metadata.xml b/virtual/perl-Term-ANSIColor/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Term-ANSIColor/metadata.xml
+++ b/virtual/perl-Term-ANSIColor/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Term-ReadLine/metadata.xml b/virtual/perl-Term-ReadLine/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Term-ReadLine/metadata.xml
+++ b/virtual/perl-Term-ReadLine/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Test-Harness/metadata.xml b/virtual/perl-Test-Harness/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Test-Harness/metadata.xml
+++ b/virtual/perl-Test-Harness/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Test-Simple/metadata.xml b/virtual/perl-Test-Simple/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Test-Simple/metadata.xml
+++ b/virtual/perl-Test-Simple/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Test/metadata.xml b/virtual/perl-Test/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Test/metadata.xml
+++ b/virtual/perl-Test/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Text-Balanced/metadata.xml b/virtual/perl-Text-Balanced/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Text-Balanced/metadata.xml
+++ b/virtual/perl-Text-Balanced/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Text-ParseWords/metadata.xml b/virtual/perl-Text-ParseWords/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Text-ParseWords/metadata.xml
+++ b/virtual/perl-Text-ParseWords/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Text-Tabs+Wrap/metadata.xml b/virtual/perl-Text-Tabs+Wrap/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Text-Tabs+Wrap/metadata.xml
+++ b/virtual/perl-Text-Tabs+Wrap/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Thread-Queue/metadata.xml b/virtual/perl-Thread-Queue/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Thread-Queue/metadata.xml
+++ b/virtual/perl-Thread-Queue/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Thread-Semaphore/metadata.xml b/virtual/perl-Thread-Semaphore/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Thread-Semaphore/metadata.xml
+++ b/virtual/perl-Thread-Semaphore/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Tie-RefHash/metadata.xml b/virtual/perl-Tie-RefHash/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-Tie-RefHash/metadata.xml
+++ b/virtual/perl-Tie-RefHash/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Time-HiRes/metadata.xml b/virtual/perl-Time-HiRes/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-HiRes/metadata.xml
+++ b/virtual/perl-Time-HiRes/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Time-Local/metadata.xml b/virtual/perl-Time-Local/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-Local/metadata.xml
+++ b/virtual/perl-Time-Local/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Time-Piece/metadata.xml b/virtual/perl-Time-Piece/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Time-Piece/metadata.xml
+++ b/virtual/perl-Time-Piece/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Unicode-Collate/metadata.xml b/virtual/perl-Unicode-Collate/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Unicode-Collate/metadata.xml
+++ b/virtual/perl-Unicode-Collate/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-Unicode-Normalize/metadata.xml b/virtual/perl-Unicode-Normalize/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-Unicode-Normalize/metadata.xml
+++ b/virtual/perl-Unicode-Normalize/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-XSLoader/metadata.xml b/virtual/perl-XSLoader/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-XSLoader/metadata.xml
+++ b/virtual/perl-XSLoader/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-autodie/metadata.xml b/virtual/perl-autodie/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-autodie/metadata.xml
+++ b/virtual/perl-autodie/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-bignum/metadata.xml b/virtual/perl-bignum/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-bignum/metadata.xml
+++ b/virtual/perl-bignum/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-if/metadata.xml b/virtual/perl-if/metadata.xml
index fcd994bc881b..166dfa27d59f 100644
--- a/virtual/perl-if/metadata.xml
+++ b/virtual/perl-if/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-libnet/metadata.xml b/virtual/perl-libnet/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-libnet/metadata.xml
+++ b/virtual/perl-libnet/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-parent/metadata.xml b/virtual/perl-parent/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-parent/metadata.xml
+++ b/virtual/perl-parent/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-podlators/metadata.xml b/virtual/perl-podlators/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-podlators/metadata.xml
+++ b/virtual/perl-podlators/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-threads-shared/metadata.xml b/virtual/perl-threads-shared/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-threads-shared/metadata.xml
+++ b/virtual/perl-threads-shared/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-threads/metadata.xml b/virtual/perl-threads/metadata.xml
index 801e9385a1e0..3df034688e17 100644
--- a/virtual/perl-threads/metadata.xml
+++ b/virtual/perl-threads/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-version/metadata.xml b/virtual/perl-version/metadata.xml
index 36ee0f08c67c..b18dca89652d 100644
--- a/virtual/perl-version/metadata.xml
+++ b/virtual/perl-version/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>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/pkgconfig/metadata.xml b/virtual/pkgconfig/metadata.xml
index 08b7896be4df..c3708add427f 100644
--- a/virtual/pkgconfig/metadata.xml
+++ b/virtual/pkgconfig/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>freedesktop</herd>
-<herd>embedded</herd>
+<maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/pmake/metadata.xml b/virtual/pmake/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/virtual/pmake/metadata.xml
+++ b/virtual/pmake/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/pypy/metadata.xml b/virtual/pypy/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/pypy/metadata.xml
+++ b/virtual/pypy/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/pypy3/metadata.xml b/virtual/pypy3/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/pypy3/metadata.xml
+++ b/virtual/pypy3/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-asyncio/metadata.xml b/virtual/python-asyncio/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-asyncio/metadata.xml
+++ b/virtual/python-asyncio/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-backports_abc/metadata.xml b/virtual/python-backports_abc/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-backports_abc/metadata.xml
+++ b/virtual/python-backports_abc/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-dnspython/metadata.xml b/virtual/python-dnspython/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-dnspython/metadata.xml
+++ b/virtual/python-dnspython/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-funcsigs/metadata.xml b/virtual/python-funcsigs/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-funcsigs/metadata.xml
+++ b/virtual/python-funcsigs/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-futures/metadata.xml b/virtual/python-futures/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-futures/metadata.xml
+++ b/virtual/python-futures/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-greenlet/metadata.xml b/virtual/python-greenlet/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-greenlet/metadata.xml
+++ b/virtual/python-greenlet/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-imaging/metadata.xml b/virtual/python-imaging/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-imaging/metadata.xml
+++ b/virtual/python-imaging/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-ipaddress/metadata.xml b/virtual/python-ipaddress/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-ipaddress/metadata.xml
+++ b/virtual/python-ipaddress/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-pathlib/metadata.xml b/virtual/python-pathlib/metadata.xml
index 301d2207cc29..a088a31999ac 100644
--- a/virtual/python-pathlib/metadata.xml
+++ b/virtual/python-pathlib/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/python-pmw/metadata.xml b/virtual/python-pmw/metadata.xml
index ee7e8b2450a8..7b0f3c40586f 100644
--- a/virtual/python-pmw/metadata.xml
+++ b/virtual/python-pmw/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/qmail/metadata.xml b/virtual/qmail/metadata.xml
index 0cb478b8c6ca..cf7950eb8559 100644
--- a/virtual/qmail/metadata.xml
+++ b/virtual/qmail/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>qmail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/ruby-ffi/metadata.xml b/virtual/ruby-ffi/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby-ffi/metadata.xml
+++ b/virtual/ruby-ffi/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>ruby</herd>
+<maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/ruby-minitest/metadata.xml b/virtual/ruby-minitest/metadata.xml
index ed77b4f90bcb..055fcc834a3b 100644
--- a/virtual/ruby-minitest/metadata.xml
+++ b/virtual/ruby-minitest/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>ruby</herd>
+ <maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/ruby-ssl/metadata.xml b/virtual/ruby-ssl/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby-ssl/metadata.xml
+++ b/virtual/ruby-ssl/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>ruby</herd>
+<maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/ruby/metadata.xml b/virtual/ruby/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/ruby/metadata.xml
+++ b/virtual/ruby/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>ruby</herd>
+<maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/rubygems/metadata.xml b/virtual/rubygems/metadata.xml
index 852136183369..3ad52af3b274 100644
--- a/virtual/rubygems/metadata.xml
+++ b/virtual/rubygems/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>ruby</herd>
+<maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/service-manager/metadata.xml b/virtual/service-manager/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/service-manager/metadata.xml
+++ b/virtual/service-manager/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/shadow/metadata.xml b/virtual/shadow/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/shadow/metadata.xml
+++ b/virtual/shadow/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/skkserv/metadata.xml b/virtual/skkserv/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/virtual/skkserv/metadata.xml
+++ b/virtual/skkserv/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/virtual/ssh/metadata.xml b/virtual/ssh/metadata.xml
index 810ac9554f4a..6522e2865145 100644
--- a/virtual/ssh/metadata.xml
+++ b/virtual/ssh/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>base-system</herd>
-<herd>embedded</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/tex-base/metadata.xml b/virtual/tex-base/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/virtual/tex-base/metadata.xml
+++ b/virtual/tex-base/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/texi2dvi/metadata.xml b/virtual/texi2dvi/metadata.xml
index 5d40bdf95b42..d21074a935e2 100644
--- a/virtual/texi2dvi/metadata.xml
+++ b/virtual/texi2dvi/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>tex</herd>
-<herd>base-system</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/ttf-fonts/metadata.xml b/virtual/ttf-fonts/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/virtual/ttf-fonts/metadata.xml
+++ b/virtual/ttf-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/virtual/w3m/metadata.xml b/virtual/w3m/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/virtual/w3m/metadata.xml
+++ b/virtual/w3m/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/virtual/yacc/metadata.xml b/virtual/yacc/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/virtual/yacc/metadata.xml
+++ b/virtual/yacc/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>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>