public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-perl/Lab-VISA/, sci-biology/aghermann/, sci-libs/armadillo/, ...
@ 2016-01-25  8:53 Justin Lecher
  0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2016-01-25  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     057a98c5e6346d6696fcc7b0ec8fefc9e826245f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 08:53:09 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 08:53:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=057a98c5

metadata.xml: Set type

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-admin/eselect/metadata.xml                       | 2 +-
 app-benchmarks/btl/metadata.xml                      | 4 ++--
 app-benchmarks/numbench/metadata.xml                 | 4 ++--
 app-doc/blacs-docs/metadata.xml                      | 2 +-
 app-doc/blas-docs/metadata.xml                       | 2 +-
 app-doc/lapack-docs/metadata.xml                     | 2 +-
 app-doc/root-docs/metadata.xml                       | 4 ++--
 app-doc/scalapack-docs/metadata.xml                  | 2 +-
 app-forensics/vine/metadata.xml                      | 2 +-
 app-portage/g-octave/metadata.xml                    | 2 +-
 app-text/dgs/metadata.xml                            | 2 +-
 app-vim/vim-gromacs/metadata.xml                     | 2 +-
 dev-cpp/eigen/metadata.xml                           | 2 +-
 dev-cpp/growler-arch/metadata.xml                    | 2 +-
 dev-cpp/growler-core/metadata.xml                    | 2 +-
 dev-cpp/growler-link/metadata.xml                    | 2 +-
 dev-cpp/growler-math/metadata.xml                    | 2 +-
 dev-cpp/growler-thread/metadata.xml                  | 2 +-
 dev-cpp/growler/metadata.xml                         | 2 +-
 dev-cpp/icnc/metadata.xml                            | 2 +-
 dev-java/fits/metadata.xml                           | 2 +-
 dev-java/flexdock/metadata.xml                       | 2 +-
 dev-java/gluegen/metadata.xml                        | 2 +-
 dev-java/hdf-java/metadata.xml                       | 2 +-
 dev-java/jeuclid-core/metadata.xml                   | 2 +-
 dev-java/jgraphx/metadata.xml                        | 2 +-
 dev-java/jhealpix/metadata.xml                       | 2 +-
 dev-java/jlatexmath-fop/metadata.xml                 | 2 +-
 dev-java/jlatexmath/metadata.xml                     | 2 +-
 dev-java/jogl/metadata.xml                           | 2 +-
 dev-java/jrosetta/metadata.xml                       | 2 +-
 dev-java/netcdf/metadata.xml                         | 2 +-
 dev-java/scirenderer/metadata.xml                    | 2 +-
 dev-lang/berkeley_upc/metadata.xml                   | 2 +-
 dev-lang/berkeley_upc_translator/metadata.xml        | 2 +-
 dev-lang/conceptual/metadata.xml                     | 2 +-
 dev-lang/icc/metadata.xml                            | 2 +-
 dev-lang/idb/metadata.xml                            | 2 +-
 dev-lang/ifc/metadata.xml                            | 2 +-
 dev-lang/ispc/metadata.xml                           | 2 +-
 dev-lang/julia/metadata.xml                          | 2 +-
 dev-lang/path64/metadata.xml                         | 2 +-
 dev-lang/pgi/metadata.xml                            | 4 ++--
 dev-lang/terra/metadata.xml                          | 2 +-
 dev-lang/vtune/metadata.xml                          | 2 +-
 dev-libs/asmjit/metadata.xml                         | 4 ++--
 dev-libs/boost-compute/metadata.xml                  | 4 ++--
 dev-libs/fortrancl/metadata.xml                      | 4 ++--
 dev-libs/intel-common/metadata.xml                   | 2 +-
 dev-libs/libconfig/metadata.xml                      | 2 +-
 dev-libs/libcuda/metadata.xml                        | 2 +-
 dev-libs/libflatarray/metadata.xml                   | 4 ++--
 dev-libs/libgdev/metadata.xml                        | 2 +-
 dev-libs/mxml/metadata.xml                           | 4 ++--
 dev-libs/simclist/metadata.xml                       | 2 +-
 dev-libs/utf8proc/metadata.xml                       | 2 +-
 dev-ml/gsl-ocaml/metadata.xml                        | 2 +-
 dev-ml/lacaml/metadata.xml                           | 2 +-
 dev-ml/mlgmpidl/metadata.xml                         | 2 +-
 dev-ml/zarith/metadata.xml                           | 2 +-
 dev-perl/BTLib/metadata.xml                          | 2 +-
 dev-perl/Bio-BigFile/metadata.xml                    | 4 ++--
 dev-perl/Bio-DB-Das-Chado/metadata.xml               | 4 ++--
 dev-perl/DBIx-DBStag/metadata.xml                    | 4 ++--
 dev-perl/Lab-Instrument/metadata.xml                 | 2 +-
 dev-perl/Lab-VISA/metadata.xml                       | 2 +-
 dev-perl/Log-Cabin/metadata.xml                      | 4 ++--
 dev-perl/Text-ParseWords/metadata.xml                | 4 ++--
 dev-perl/Time-Progress/metadata.xml                  | 4 ++--
 dev-perl/go-db-perl/metadata.xml                     | 2 +-
 dev-perl/go-perl/metadata.xml                        | 4 ++--
 dev-perl/opal-client/metadata.xml                    | 2 +-
 dev-python/Forthon/metadata.xml                      | 2 +-
 dev-python/GOGrapher/metadata.xml                    | 4 ++--
 dev-python/PeakUtils/metadata.xml                    | 2 +-
 dev-python/RecSQL/metadata.xml                       | 4 ++--
 dev-python/arrayfire-python/metadata.xml             | 4 ++--
 dev-python/astlib/metadata.xml                       | 2 +-
 dev-python/astropy-helpers/metadata.xml              | 2 +-
 dev-python/astropy/metadata.xml                      | 4 ++--
 dev-python/astropysics/metadata.xml                  | 2 +-
 dev-python/astroquery/metadata.xml                   | 2 +-
 dev-python/brewer2mpl/metadata.xml                   | 4 ++--
 dev-python/ccdproc/metadata.xml                      | 2 +-
 dev-python/coards/metadata.xml                       | 2 +-
 dev-python/coords/metadata.xml                       | 2 +-
 dev-python/cosmocalc/metadata.xml                    | 2 +-
 dev-python/dimensionful/metadata.xml                 | 2 +-
 dev-python/emcee/metadata.xml                        | 2 +-
 dev-python/ffc/metadata.xml                          | 2 +-
 dev-python/ffnet/metadata.xml                        | 2 +-
 dev-python/fiat/metadata.xml                         | 2 +-
 dev-python/future/metadata.xml                       | 4 ++--
 dev-python/gammapy/metadata.xml                      | 2 +-
 dev-python/healpy/metadata.xml                       | 2 +-
 dev-python/imageutils/metadata.xml                   | 2 +-
 dev-python/inference/metadata.xml                    | 2 +-
 dev-python/instant/metadata.xml                      | 2 +-
 dev-python/ipykernel/metadata.xml                    | 2 +-
 dev-python/ipyparallel/metadata.xml                  | 2 +-
 dev-python/ipython_genutils/metadata.xml             | 2 +-
 dev-python/ipywidgets/metadata.xml                   | 2 +-
 dev-python/jupyter_client/metadata.xml               | 2 +-
 dev-python/jupyter_console/metadata.xml              | 2 +-
 dev-python/jupyter_core/metadata.xml                 | 2 +-
 dev-python/matlab_wrapper/metadata.xml               | 4 ++--
 dev-python/matplotlib-venn/metadata.xml              | 2 +-
 dev-python/matplotlib2tikz/metadata.xml              | 4 ++--
 dev-python/matrix2latex/metadata.xml                 | 2 +-
 dev-python/meshpy/metadata.xml                       | 2 +-
 dev-python/metakernel/metadata.xml                   | 2 +-
 dev-python/metakernel_bash/metadata.xml              | 2 +-
 dev-python/metakernel_python/metadata.xml            | 2 +-
 dev-python/montage-wrapper/metadata.xml              | 2 +-
 dev-python/nbconvert/metadata.xml                    | 2 +-
 dev-python/nbformat/metadata.xml                     | 2 +-
 dev-python/nbviewer/metadata.xml                     | 2 +-
 dev-python/newrelic/metadata.xml                     | 2 +-
 dev-python/notebook/metadata.xml                     | 2 +-
 dev-python/nvidia-ml-py/metadata.xml                 | 4 ++--
 dev-python/omniorbpy/metadata.xml                    | 2 +-
 dev-python/opal-client/metadata.xml                  | 2 +-
 dev-python/pamela/metadata.xml                       | 2 +-
 dev-python/photutils/metadata.xml                    | 2 +-
 dev-python/pickleshare/metadata.xml                  | 2 +-
 dev-python/prettyplotlib/metadata.xml                | 2 +-
 dev-python/psubprocess/metadata.xml                  | 4 ++--
 dev-python/ptyprocess/metadata.xml                   | 2 +-
 dev-python/pyfftw/metadata.xml                       | 4 ++--
 dev-python/pyhdf/metadata.xml                        | 4 ++--
 dev-python/pylibconfig2/metadata.xml                 | 4 ++--
 dev-python/pymvpa/metadata.xml                       | 2 +-
 dev-python/pynomo/metadata.xml                       | 2 +-
 dev-python/pysolar/metadata.xml                      | 2 +-
 dev-python/pysparse/metadata.xml                     | 2 +-
 dev-python/python-ivi/metadata.xml                   | 4 ++--
 dev-python/python-vxi11/metadata.xml                 | 4 ++--
 dev-python/pythoncgns/metadata.xml                   | 2 +-
 dev-python/pythonocc/metadata.xml                    | 2 +-
 dev-python/pythonqt/metadata.xml                     | 2 +-
 dev-python/pywcsgrid2/metadata.xml                   | 2 +-
 dev-python/qtconsole/metadata.xml                    | 2 +-
 dev-python/snakemake/metadata.xml                    | 4 ++--
 dev-python/specutils/metadata.xml                    | 2 +-
 dev-python/symengine/metadata.xml                    | 4 ++--
 dev-python/testpath/metadata.xml                     | 2 +-
 dev-python/traitlets/metadata.xml                    | 2 +-
 dev-python/ufl/metadata.xml                          | 2 +-
 dev-python/viper/metadata.xml                        | 2 +-
 dev-tcltk/img_rotate/metadata.xml                    | 2 +-
 dev-tcltk/togl/metadata.xml                          | 2 +-
 dev-tex/pythontex/metadata.xml                       | 2 +-
 dev-util/VampirTrace/metadata.xml                    | 4 ++--
 dev-util/amdapp/metadata.xml                         | 4 ++--
 dev-util/emscripten-fastcomp/metadata.xml            | 2 +-
 dev-util/emscripten/metadata.xml                     | 2 +-
 dev-util/f90cache/metadata.xml                       | 2 +-
 dev-util/ndiff/metadata.xml                          | 4 ++--
 dev-util/numdiff/metadata.xml                        | 4 ++--
 dev-util/nvidia-cuda-gdk/metadata.xml                | 4 ++--
 media-gfx/PhiloGL/metadata.xml                       | 2 +-
 media-gfx/brlcad/metadata.xml                        | 6 +++---
 media-gfx/librecad/metadata.xml                      | 2 +-
 media-libs/OpenMOIV/metadata.xml                     | 2 +-
 media-libs/avbin-bin/metadata.xml                    | 4 ++--
 media-libs/libgfx/metadata.xml                       | 2 +-
 net-ftp/bbftp-client/metadata.xml                    | 2 +-
 net-ftp/bbftp-server/metadata.xml                    | 2 +-
 net-misc/bbscp/metadata.xml                          | 2 +-
 perl-core/encoding-warnings/metadata.xml             | 2 +-
 sci-astronomy/astrometry/metadata.xml                | 2 +-
 sci-astronomy/bpz/metadata.xml                       | 2 +-
 sci-astronomy/casapy-bin/metadata.xml                | 2 +-
 sci-astronomy/chealpix/metadata.xml                  | 2 +-
 sci-astronomy/eazy/metadata.xml                      | 2 +-
 sci-astronomy/eye/metadata.xml                       | 2 +-
 sci-astronomy/galfit-bin/metadata.xml                | 2 +-
 sci-astronomy/healpix_cxx/metadata.xml               | 2 +-
 sci-astronomy/healpix_idl/metadata.xml               | 2 +-
 sci-astronomy/lephare/metadata.xml                   | 2 +-
 sci-astronomy/libthesky/metadata.xml                 | 4 ++--
 sci-astronomy/missfits/metadata.xml                  | 2 +-
 sci-astronomy/montage/metadata.xml                   | 2 +-
 sci-astronomy/mosstack/metadata.xml                  | 2 +-
 sci-astronomy/psfex/metadata.xml                     | 2 +-
 sci-astronomy/scamp/metadata.xml                     | 2 +-
 sci-astronomy/sextractor/metadata.xml                | 2 +-
 sci-astronomy/skymaker/metadata.xml                  | 2 +-
 sci-astronomy/starlink-bin/metadata.xml              | 2 +-
 sci-astronomy/stiff/metadata.xml                     | 2 +-
 sci-astronomy/stilts/metadata.xml                    | 2 +-
 sci-astronomy/stuff/metadata.xml                     | 2 +-
 sci-astronomy/swarp/metadata.xml                     | 2 +-
 sci-astronomy/topcat/metadata.xml                    | 2 +-
 sci-astronomy/weightwatcher/metadata.xml             | 2 +-
 sci-astronomy/zebra/metadata.xml                     | 2 +-
 sci-astronomy/zpeg/metadata.xml                      | 2 +-
 sci-biology/AlignGraph/metadata.xml                  | 4 ++--
 sci-biology/Atlas-Link/metadata.xml                  | 4 ++--
 sci-biology/Atlas/metadata.xml                       | 4 ++--
 sci-biology/Atlas2/metadata.xml                      | 4 ++--
 sci-biology/Atlas_GapFill/metadata.xml               | 4 ++--
 sci-biology/BBmap/metadata.xml                       | 4 ++--
 sci-biology/BG7/metadata.xml                         | 2 +-
 sci-biology/BRAKER/metadata.xml                      | 4 ++--
 sci-biology/BRANCH/metadata.xml                      | 4 ++--
 sci-biology/BamView/metadata.xml                     | 4 ++--
 sci-biology/BlastToSam/metadata.xml                  | 4 ++--
 sci-biology/CONTIGuator/metadata.xml                 | 4 ++--
 sci-biology/DisEMBL/metadata.xml                     | 4 ++--
 sci-biology/EBARDenovo/metadata.xml                  | 4 ++--
 sci-biology/ESTate/metadata.xml                      | 4 ++--
 sci-biology/FLASH/metadata.xml                       | 4 ++--
 sci-biology/GAL/metadata.xml                         | 4 ++--
 sci-biology/Gambit/metadata.xml                      | 4 ++--
 sci-biology/HTSeq/metadata.xml                       | 4 ++--
 sci-biology/ICC/metadata.xml                         | 4 ++--
 sci-biology/IMAGE/metadata.xml                       | 4 ++--
 sci-biology/InterMine/metadata.xml                   | 4 ++--
 sci-biology/Jannovar-bin/metadata.xml                | 4 ++--
 sci-biology/KaKs_Calculator/metadata.xml             | 4 ++--
 sci-biology/MaSuRCA/metadata.xml                     | 4 ++--
 sci-biology/MagicViewer/metadata.xml                 | 4 ++--
 sci-biology/MeV/metadata.xml                         | 4 ++--
 sci-biology/MochiView/metadata.xml                   | 4 ++--
 sci-biology/MuSeqBox/metadata.xml                    | 4 ++--
 sci-biology/NGSTools/metadata.xml                    | 4 ++--
 sci-biology/OBO-Edit/metadata.xml                    | 4 ++--
 sci-biology/ONTO-PERL/metadata.xml                   | 2 +-
 sci-biology/ORFcor/metadata.xml                      | 4 ++--
 sci-biology/RADtools/metadata.xml                    | 4 ++--
 sci-biology/RSeQC/metadata.xml                       | 4 ++--
 sci-biology/Ray/metadata.xml                         | 4 ++--
 sci-biology/Rcorrector/metadata.xml                  | 4 ++--
 sci-biology/SEECER/metadata.xml                      | 4 ++--
 sci-biology/SSAKE/metadata.xml                       | 4 ++--
 sci-biology/STAR/metadata.xml                        | 4 ++--
 sci-biology/SolexaQA/metadata.xml                    | 4 ++--
 sci-biology/StarORF/metadata.xml                     | 4 ++--
 sci-biology/TransDecoder/metadata.xml                | 4 ++--
 sci-biology/Trinotate/metadata.xml                   | 4 ++--
 sci-biology/VarScan/metadata.xml                     | 2 +-
 sci-biology/VelvetOptimiser/metadata.xml             | 4 ++--
 sci-biology/YASRA/metadata.xml                       | 4 ++--
 sci-biology/abacas/metadata.xml                      | 4 ++--
 sci-biology/abyss/metadata.xml                       | 2 +-
 sci-biology/aghermann/metadata.xml                   | 4 ++--
 sci-biology/align_to_scf/metadata.xml                | 4 ++--
 sci-biology/amos/metadata.xml                        | 4 ++--
 sci-biology/ampliconnoise/metadata.xml               | 4 ++--
 sci-biology/angsd/metadata.xml                       | 4 ++--
 sci-biology/ants/metadata.xml                        | 2 +-
 sci-biology/apollo/metadata.xml                      | 4 ++--
 sci-biology/argo-bin/metadata.xml                    | 4 ++--
 sci-biology/argo/metadata.xml                        | 4 ++--
 sci-biology/artemis-bin/metadata.xml                 | 4 ++--
 sci-biology/artemis/metadata.xml                     | 4 ++--
 sci-biology/atsas/metadata.xml                       | 2 +-
 sci-biology/augustus/metadata.xml                    | 2 +-
 sci-biology/autoeditor/metadata.xml                  | 4 ++--
 sci-biology/bambino/metadata.xml                     | 4 ++--
 sci-biology/bambus/metadata.xml                      | 4 ++--
 sci-biology/bamtools/metadata.xml                    | 4 ++--
 sci-biology/barnacle/metadata.xml                    | 4 ++--
 sci-biology/barrnap/metadata.xml                     | 4 ++--
 sci-biology/bcftools/metadata.xml                    | 4 ++--
 sci-biology/beagle/metadata.xml                      | 4 ++--
 sci-biology/beaglecall/metadata.xml                  | 4 ++--
 sci-biology/bedtools/metadata.xml                    | 6 +++---
 sci-biology/biobambam/metadata.xml                   | 2 +-
 sci-biology/biopieces/metadata.xml                   | 4 ++--
 sci-biology/bismark/metadata.xml                     | 4 ++--
 sci-biology/blasr/metadata.xml                       | 4 ++--
 sci-biology/blue/metadata.xml                        | 4 ++--
 sci-biology/brat/metadata.xml                        | 4 ++--
 sci-biology/breakdancer/metadata.xml                 | 4 ++--
 sci-biology/bru2nii/metadata.xml                     | 2 +-
 sci-biology/bx-python/metadata.xml                   | 4 ++--
 sci-biology/caftools/metadata.xml                    | 4 ++--
 sci-biology/cap3-bin/metadata.xml                    | 4 ++--
 sci-biology/cast-bin/metadata.xml                    | 4 ++--
 sci-biology/cd-hit-auxtools/metadata.xml             | 4 ++--
 sci-biology/cd-hit/metadata.xml                      | 2 +-
 sci-biology/cdbfasta/metadata.xml                    | 4 ++--
 sci-biology/cegma/metadata.xml                       | 4 ++--
 sci-biology/cgview-bin/metadata.xml                  | 4 ++--
 sci-biology/clover/metadata.xml                      | 4 ++--
 sci-biology/cluster/metadata.xml                     | 4 ++--
 sci-biology/clview/metadata.xml                      | 4 ++--
 sci-biology/cnrun/metadata.xml                       | 4 ++--
 sci-biology/codonw/metadata.xml                      | 4 ++--
 sci-biology/conform-gt/metadata.xml                  | 4 ++--
 sci-biology/conifer/metadata.xml                     | 4 ++--
 sci-biology/consed/metadata.xml                      | 4 ++--
 sci-biology/consed2gap/metadata.xml                  | 4 ++--
 sci-biology/coral/metadata.xml                       | 4 ++--
 sci-biology/cortex_var/metadata.xml                  | 4 ++--
 sci-biology/cutadapt/metadata.xml                    | 4 ++--
 sci-biology/dawg/metadata.xml                        | 2 +-
 sci-biology/dcmstack/metadata.xml                    | 2 +-
 sci-biology/discrover/metadata.xml                   | 2 +-
 sci-biology/dna2pep/metadata.xml                     | 4 ++--
 sci-biology/ePCR/metadata.xml                        | 4 ++--
 sci-biology/edena/metadata.xml                       | 4 ++--
 sci-biology/epga/metadata.xml                        | 4 ++--
 sci-biology/erpin/metadata.xml                       | 4 ++--
 sci-biology/est2assembly/metadata.xml                | 4 ++--
 sci-biology/estscan/metadata.xml                     | 4 ++--
 sci-biology/eval/metadata.xml                        | 4 ++--
 sci-biology/exomiser-bin/metadata.xml                | 4 ++--
 sci-biology/exonerate-gff3/metadata.xml              | 4 ++--
 sci-biology/fastdnaml/metadata.xml                   | 4 ++--
 sci-biology/fastqc/metadata.xml                      | 4 ++--
 sci-biology/fastx_toolkit/metadata.xml               | 2 +-
 sci-biology/ffindex/metadata.xml                     | 4 ++--
 sci-biology/flexbar/metadata.xml                     | 4 ++--
 sci-biology/freebayes/metadata.xml                   | 4 ++--
 sci-biology/fsa/metadata.xml                         | 4 ++--
 sci-biology/fsl/metadata.xml                         | 2 +-
 sci-biology/full_lengther_next/metadata.xml          | 4 ++--
 sci-biology/gap2caf/metadata.xml                     | 4 ++--
 sci-biology/gbench/metadata.xml                      | 2 +-
 sci-biology/gbrowse/metadata.xml                     | 4 ++--
 sci-biology/geneid/metadata.xml                      | 4 ++--
 sci-biology/genepop/metadata.xml                     | 4 ++--
 sci-biology/generecon/metadata.xml                   | 4 ++--
 sci-biology/genometools/metadata.xml                 | 4 ++--
 sci-biology/genomeview-bin/metadata.xml              | 4 ++--
 sci-biology/genseed/metadata.xml                     | 4 ++--
 sci-biology/gfftools/metadata.xml                    | 4 ++--
 sci-biology/gffutils/metadata.xml                    | 4 ++--
 sci-biology/glean/metadata.xml                       | 4 ++--
 sci-biology/grappa/metadata.xml                      | 4 ++--
 sci-biology/hexamer/metadata.xml                     | 4 ++--
 sci-biology/hmmer/metadata.xml                       | 2 +-
 sci-biology/hydra-sv/metadata.xml                    | 2 +-
 sci-biology/igv/metadata.xml                         | 4 ++--
 sci-biology/inGAP-bin/metadata.xml                   | 4 ++--
 sci-biology/jellyfish/metadata.xml                   | 4 ++--
 sci-biology/jigsaw/metadata.xml                      | 4 ++--
 sci-biology/jtreeview/metadata.xml                   | 4 ++--
 sci-biology/kallisto/metadata.xml                    | 4 ++--
 sci-biology/khmer/metadata.xml                       | 4 ++--
 sci-biology/kmergenie/metadata.xml                   | 4 ++--
 sci-biology/lastz/metadata.xml                       | 4 ++--
 sci-biology/libgtextutils/metadata.xml               | 4 ++--
 sci-biology/lighter/metadata.xml                     | 4 ++--
 sci-biology/lucy/metadata.xml                        | 4 ++--
 sci-biology/mRNAmarkup/metadata.xml                  | 4 ++--
 sci-biology/maker/metadata.xml                       | 4 ++--
 sci-biology/manatee-igs/metadata.xml                 | 4 ++--
 sci-biology/manatee-jcvi/metadata.xml                | 4 ++--
 sci-biology/mavid/metadata.xml                       | 4 ++--
 sci-biology/merlin/metadata.xml                      | 4 ++--
 sci-biology/metaseq/metadata.xml                     | 4 ++--
 sci-biology/mgblast/metadata.xml                     | 4 ++--
 sci-biology/minced/metadata.xml                      | 4 ++--
 sci-biology/mip-scaffolder/metadata.xml              | 4 ++--
 sci-biology/mira/metadata.xml                        | 2 +-
 sci-biology/miranda/metadata.xml                     | 4 ++--
 sci-biology/mne-python/metadata.xml                  | 2 +-
 sci-biology/mosaik/metadata.xml                      | 4 ++--
 sci-biology/mothur/metadata.xml                      | 2 +-
 sci-biology/mreps/metadata.xml                       | 4 ++--
 sci-biology/mrfast/metadata.xml                      | 4 ++--
 sci-biology/mricron/metadata.xml                     | 2 +-
 sci-biology/mrsfast/metadata.xml                     | 4 ++--
 sci-biology/ncbi-blast+/metadata.xml                 | 4 ++--
 sci-biology/ncbi-tools++/metadata.xml                | 4 ++--
 sci-biology/nesoni/metadata.xml                      | 4 ++--
 sci-biology/ngs_backbone/metadata.xml                | 4 ++--
 sci-biology/ngsview/metadata.xml                     | 4 ++--
 sci-biology/nilearn/metadata.xml                     | 4 ++--
 sci-biology/nistats/metadata.xml                     | 4 ++--
 sci-biology/nrcl/metadata.xml                        | 4 ++--
 sci-biology/nwalign/metadata.xml                     | 4 ++--
 sci-biology/pairagon/metadata.xml                    | 4 ++--
 sci-biology/parafly/metadata.xml                     | 4 ++--
 sci-biology/pb-honey/metadata.xml                    | 4 ++--
 sci-biology/pb-jelly/metadata.xml                    | 4 ++--
 sci-biology/perlprimer/metadata.xml                  | 2 +-
 sci-biology/phusion/metadata.xml                     | 4 ++--
 sci-biology/pileup/metadata.xml                      | 4 ++--
 sci-biology/plinkseq/metadata.xml                    | 4 ++--
 sci-biology/polyphen/metadata.xml                    | 4 ++--
 sci-biology/primerD/metadata.xml                     | 4 ++--
 sci-biology/proda/metadata.xml                       | 2 +-
 sci-biology/prokka/metadata.xml                      | 4 ++--
 sci-biology/prot4EST/metadata.xml                    | 4 ++--
 sci-biology/psx/metadata.xml                         | 4 ++--
 sci-biology/psychopy/metadata.xml                    | 2 +-
 sci-biology/pvmsx/metadata.xml                       | 4 ++--
 sci-biology/pybedtools/metadata.xml                  | 4 ++--
 sci-biology/pybrain/metadata.xml                     | 2 +-
 sci-biology/pyfaidx/metadata.xml                     | 4 ++--
 sci-biology/pysam/metadata.xml                       | 2 +-
 sci-biology/pysurfer/metadata.xml                    | 2 +-
 sci-biology/quast/metadata.xml                       | 4 ++--
 sci-biology/quicktree/metadata.xml                   | 4 ++--
 sci-biology/quorum/metadata.xml                      | 4 ++--
 sci-biology/repeatmasker-libraries/metadata.xml      | 2 +-
 sci-biology/repeatmasker/metadata.xml                | 2 +-
 sci-biology/reptile/metadata.xml                     | 4 ++--
 sci-biology/rnaplex/metadata.xml                     | 4 ++--
 sci-biology/roche454ace2caf/metadata.xml             | 4 ++--
 sci-biology/ruffus/metadata.xml                      | 4 ++--
 sci-biology/rum/metadata.xml                         | 4 ++--
 sci-biology/sabre/metadata.xml                       | 4 ++--
 sci-biology/salmon/metadata.xml                      | 4 ++--
 sci-biology/samstat/metadata.xml                     | 4 ++--
 sci-biology/samtools/metadata.xml                    | 2 +-
 sci-biology/scaffold_builder/metadata.xml            | 4 ++--
 sci-biology/scan_for_matches/metadata.xml            | 4 ++--
 sci-biology/scbi_blast/metadata.xml                  | 4 ++--
 sci-biology/scbi_fasta/metadata.xml                  | 4 ++--
 sci-biology/scbi_mapreduce/metadata.xml              | 4 ++--
 sci-biology/scbi_plot/metadata.xml                   | 4 ++--
 sci-biology/sclust/metadata.xml                      | 4 ++--
 sci-biology/screed/metadata.xml                      | 2 +-
 sci-biology/scythe/metadata.xml                      | 4 ++--
 sci-biology/seqclean/metadata.xml                    | 4 ++--
 sci-biology/seqtools/metadata.xml                    | 4 ++--
 sci-biology/sequin/metadata.xml                      | 2 +-
 sci-biology/sff_dump/metadata.xml                    | 4 ++--
 sci-biology/sga/metadata.xml                         | 4 ++--
 sci-biology/sgp2/metadata.xml                        | 4 ++--
 sci-biology/sickle/metadata.xml                      | 4 ++--
 sci-biology/signalp/metadata.xml                     | 4 ++--
 sci-biology/skewer-bin/metadata.xml                  | 4 ++--
 sci-biology/smalt-bin/metadata.xml                   | 4 ++--
 sci-biology/snap/metadata.xml                        | 4 ++--
 sci-biology/snphylo/metadata.xml                     | 4 ++--
 sci-biology/spm/metadata.xml                         | 2 +-
 sci-biology/sra_sdk/metadata.xml                     | 4 ++--
 sci-biology/ssaha2-bin/metadata.xml                  | 4 ++--
 sci-biology/stacks/metadata.xml                      | 4 ++--
 sci-biology/staden/metadata.xml                      | 4 ++--
 sci-biology/subread/metadata.xml                     | 4 ++--
 sci-biology/swissknife/metadata.xml                  | 2 +-
 sci-biology/symap/metadata.xml                       | 2 +-
 sci-biology/tablet-bin/metadata.xml                  | 4 ++--
 sci-biology/tablet/metadata.xml                      | 4 ++--
 sci-biology/tagdust/metadata.xml                     | 4 ++--
 sci-biology/tclust/metadata.xml                      | 4 ++--
 sci-biology/tgicl/metadata.xml                       | 4 ++--
 sci-biology/tigr-foundation-libs/metadata.xml        | 4 ++--
 sci-biology/tmhmm/metadata.xml                       | 4 ++--
 sci-biology/tophat/metadata.xml                      | 2 +-
 sci-biology/trans-abyss/metadata.xml                 | 4 ++--
 sci-biology/trf/metadata.xml                         | 2 +-
 sci-biology/trim_galore/metadata.xml                 | 4 ++--
 sci-biology/trimmomatic/metadata.xml                 | 4 ++--
 sci-biology/trinityrnaseq/metadata.xml               | 4 ++--
 sci-biology/trowel/metadata.xml                      | 4 ++--
 sci-biology/twinscan/metadata.xml                    | 4 ++--
 sci-biology/ugene/metadata.xml                       | 4 ++--
 sci-biology/vague-bin/metadata.xml                   | 4 ++--
 sci-biology/velvetk/metadata.xml                     | 4 ++--
 sci-biology/wcd/metadata.xml                         | 4 ++--
 sci-biology/weblogo/metadata.xml                     | 4 ++--
 sci-biology/wgs-assembler/metadata.xml               | 2 +-
 sci-biology/wise/metadata.xml                        | 2 +-
 sci-biology/zmsort/metadata.xml                      | 4 ++--
 sci-chemistry/GromacsWrapper/metadata.xml            | 4 ++--
 sci-chemistry/NMRdyn/metadata.xml                    | 2 +-
 sci-chemistry/ambertools/metadata.xml                | 4 ++--
 sci-chemistry/ball/metadata.xml                      | 4 ++--
 sci-chemistry/burrow-owl/metadata.xml                | 2 +-
 sci-chemistry/camshift/metadata.xml                  | 2 +-
 sci-chemistry/chemBuild/metadata.xml                 | 2 +-
 sci-chemistry/chimera-bin/metadata.xml               | 2 +-
 sci-chemistry/chooch/metadata.xml                    | 2 +-
 sci-chemistry/cnsface/metadata.xml                   | 2 +-
 sci-chemistry/concoord/metadata.xml                  | 4 ++--
 sci-chemistry/coot/metadata.xml                      | 4 ++--
 sci-chemistry/cpmgfit/metadata.xml                   | 2 +-
 sci-chemistry/cs-rosetta/metadata.xml                | 2 +-
 sci-chemistry/curvefit/metadata.xml                  | 2 +-
 sci-chemistry/dl_poly/metadata.xml                   | 4 ++--
 sci-chemistry/drawxtl/metadata.xml                   | 2 +-
 sci-chemistry/dssp2pdb/metadata.xml                  | 2 +-
 sci-chemistry/erkale/metadata.xml                    | 4 ++--
 sci-chemistry/freeon/metadata.xml                    | 4 ++--
 sci-chemistry/gamess/metadata.xml                    | 4 ++--
 sci-chemistry/gromacs/metadata.xml                   | 4 ++--
 sci-chemistry/hydronmr/metadata.xml                  | 2 +-
 sci-chemistry/jana2000/metadata.xml                  | 2 +-
 sci-chemistry/jligand/metadata.xml                   | 2 +-
 sci-chemistry/ligplot+/metadata.xml                  | 2 +-
 sci-chemistry/mage/metadata.xml                      | 2 +-
 sci-chemistry/mddnmr/metadata.xml                    | 2 +-
 sci-chemistry/mdsctk/metadata.xml                    | 4 ++--
 sci-chemistry/mgltools-autodocktools/metadata.xml    | 2 +-
 sci-chemistry/mgltools-bhtree/metadata.xml           | 2 +-
 sci-chemistry/mgltools-cadd/metadata.xml             | 2 +-
 sci-chemistry/mgltools-cmolkit/metadata.xml          | 2 +-
 sci-chemistry/mgltools-dejavu/metadata.xml           | 2 +-
 sci-chemistry/mgltools-geomutils/metadata.xml        | 2 +-
 sci-chemistry/mgltools-gle/metadata.xml              | 2 +-
 sci-chemistry/mgltools-mglutil/metadata.xml          | 2 +-
 sci-chemistry/mgltools-molkit/metadata.xml           | 2 +-
 sci-chemistry/mgltools-networkeditor/metadata.xml    | 2 +-
 sci-chemistry/mgltools-opengltk/metadata.xml         | 2 +-
 sci-chemistry/mgltools-pmv/metadata.xml              | 2 +-
 sci-chemistry/mgltools-pyautodock/metadata.xml       | 2 +-
 sci-chemistry/mgltools-pybabel/metadata.xml          | 2 +-
 sci-chemistry/mgltools-pyglf/metadata.xml            | 2 +-
 sci-chemistry/mgltools-qslimlib/metadata.xml         | 2 +-
 sci-chemistry/mgltools-scenario2/metadata.xml        | 2 +-
 sci-chemistry/mgltools-sff/metadata.xml              | 2 +-
 sci-chemistry/mgltools-support/metadata.xml          | 2 +-
 sci-chemistry/mgltools-symserv/metadata.xml          | 2 +-
 sci-chemistry/mgltools-utpackages/metadata.xml       | 2 +-
 sci-chemistry/mgltools-viewer-framework/metadata.xml | 2 +-
 sci-chemistry/mgltools-vision/metadata.xml           | 2 +-
 sci-chemistry/mgltools-visionlib/metadata.xml        | 2 +-
 sci-chemistry/mgltools-volume/metadata.xml           | 2 +-
 sci-chemistry/mgltools-webservices/metadata.xml      | 2 +-
 sci-chemistry/mgltools/metadata.xml                  | 2 +-
 sci-chemistry/mics/metadata.xml                      | 2 +-
 sci-chemistry/modelfree/metadata.xml                 | 4 ++--
 sci-chemistry/modeller/metadata.xml                  | 2 +-
 sci-chemistry/module2/metadata.xml                   | 4 ++--
 sci-chemistry/mtz2hkl/metadata.xml                   | 2 +-
 sci-chemistry/mtz2sca/metadata.xml                   | 2 +-
 sci-chemistry/nMOLDYN/metadata.xml                   | 4 ++--
 sci-chemistry/nmrpipe/metadata.xml                   | 4 ++--
 sci-chemistry/nmrview/metadata.xml                   | 4 ++--
 sci-chemistry/nwchem/metadata.xml                    | 4 ++--
 sci-chemistry/openbabel-java/metadata.xml            | 2 +-
 sci-chemistry/openbabel-perl/metadata.xml            | 2 +-
 sci-chemistry/openbabel-python/metadata.xml          | 2 +-
 sci-chemistry/openbabel-ruby/metadata.xml            | 2 +-
 sci-chemistry/openbabel/metadata.xml                 | 2 +-
 sci-chemistry/pales-bin/metadata.xml                 | 4 ++--
 sci-chemistry/panav/metadata.xml                     | 4 ++--
 sci-chemistry/pesto/metadata.xml                     | 2 +-
 sci-chemistry/phenix-bin/metadata.xml                | 2 +-
 sci-chemistry/polygon/metadata.xml                   | 2 +-
 sci-chemistry/pymol-plugins-ezviz/metadata.xml       | 4 ++--
 sci-chemistry/pymol-plugins-psico/metadata.xml       | 4 ++--
 sci-chemistry/pymol/metadata.xml                     | 4 ++--
 sci-chemistry/pyquante/metadata.xml                  | 2 +-
 sci-chemistry/redcat/metadata.xml                    | 4 ++--
 sci-chemistry/rosetta-tools/metadata.xml             | 2 +-
 sci-chemistry/rosetta/metadata.xml                   | 2 +-
 sci-chemistry/shiftx/metadata.xml                    | 2 +-
 sci-chemistry/shiftx2/metadata.xml                   | 2 +-
 sci-chemistry/simpson/metadata.xml                   | 2 +-
 sci-chemistry/smmp/metadata.xml                      | 2 +-
 sci-chemistry/specView/metadata.xml                  | 2 +-
 sci-chemistry/ssp/metadata.xml                       | 4 ++--
 sci-chemistry/talosn/metadata.xml                    | 2 +-
 sci-chemistry/trajng/metadata.xml                    | 4 ++--
 sci-chemistry/unio/metadata.xml                      | 2 +-
 sci-chemistry/usf-tools/metadata.xml                 | 2 +-
 sci-chemistry/votca-csg/metadata.xml                 | 4 ++--
 sci-chemistry/votca-csgapps/metadata.xml             | 4 ++--
 sci-chemistry/wxmacmolplt/metadata.xml               | 2 +-
 sci-chemistry/xplor-nih/metadata.xml                 | 2 +-
 sci-electronics/minipro/metadata.xml                 | 2 +-
 sci-electronics/player/metadata.xml                  | 2 +-
 sci-electronics/stage/metadata.xml                   | 2 +-
 sci-electronics/tnt/metadata.xml                     | 2 +-
 sci-geosciences/pydap/metadata.xml                   | 4 ++--
 sci-geosciences/pydap_handlers_cdms/metadata.xml     | 4 ++--
 sci-geosciences/pydap_handlers_csv/metadata.xml      | 4 ++--
 sci-geosciences/pydap_handlers_hdf5/metadata.xml     | 4 ++--
 sci-geosciences/pydap_handlers_nca/metadata.xml      | 4 ++--
 sci-geosciences/pydap_handlers_netcdf/metadata.xml   | 4 ++--
 sci-geosciences/pydap_handlers_proxy/metadata.xml    | 4 ++--
 sci-geosciences/pydap_handlers_sql/metadata.xml      | 4 ++--
 sci-geosciences/pydap_handlers_sqlite/metadata.xml   | 4 ++--
 sci-geosciences/pydap_responses_kml/metadata.xml     | 4 ++--
 sci-geosciences/pydap_responses_matlab/metadata.xml  | 4 ++--
 sci-geosciences/pydap_responses_netcdf/metadata.xml  | 4 ++--
 sci-geosciences/pydap_responses_wms/metadata.xml     | 4 ++--
 sci-geosciences/pydap_responses_xls/metadata.xml     | 4 ++--
 sci-geosciences/qgis/metadata.xml                    | 2 +-
 sci-libs/Cgraph/metadata.xml                         | 2 +-
 sci-libs/acml/metadata.xml                           | 2 +-
 sci-libs/amber99sb_phipsi/metadata.xml               | 2 +-
 sci-libs/amber99sbnmr-ildn/metadata.xml              | 2 +-
 sci-libs/amber99sbnmr/metadata.xml                   | 2 +-
 sci-libs/amdlibm/metadata.xml                        | 2 +-
 sci-libs/armadillo/metadata.xml                      | 2 +-
 sci-libs/arrayfire/metadata.xml                      | 4 ++--
 sci-libs/asl/metadata.xml                            | 4 ++--
 sci-libs/atlas/metadata.xml                          | 2 +-
 sci-libs/bigdft-abi/metadata.xml                     | 2 +-
 sci-libs/blas-reference/metadata.xml                 | 2 +-
 sci-libs/blastdb/metadata.xml                        | 2 +-
 sci-libs/bloom/metadata.xml                          | 4 ++--
 sci-libs/calculix-ccx/metadata.xml                   | 2 +-
 sci-libs/calculix-cgx/metadata.xml                   | 2 +-
 sci-libs/cblas-reference/metadata.xml                | 2 +-
 sci-libs/ccif/metadata.xml                           | 4 ++--
 sci-libs/cgnstools/metadata.xml                      | 2 +-
 sci-libs/clblas/metadata.xml                         | 2 +-
 sci-libs/clfft/metadata.xml                          | 4 ++--
 sci-libs/clrng/metadata.xml                          | 2 +-
 sci-libs/cs-rosetta-db/metadata.xml                  | 2 +-
 sci-libs/dcmtk/metadata.xml                          | 2 +-
 sci-libs/dealii/metadata.xml                         | 4 ++--
 sci-libs/elmer-eio/metadata.xml                      | 2 +-
 sci-libs/elmer-hutiter/metadata.xml                  | 2 +-
 sci-libs/etsf_io/metadata.xml                        | 2 +-
 sci-libs/factory/metadata.xml                        | 4 ++--
 sci-libs/fdlibm/metadata.xml                         | 2 +-
 sci-libs/fftw/metadata.xml                           | 2 +-
 sci-libs/fgsl/metadata.xml                           | 4 ++--
 sci-libs/fox/metadata.xml                            | 2 +-
 sci-libs/framewave/metadata.xml                      | 2 +-
 sci-libs/geom/metadata.xml                           | 2 +-
 sci-libs/ghmm/metadata.xml                           | 4 ++--
 sci-libs/givaro/metadata.xml                         | 2 +-
 sci-libs/gmsh/metadata.xml                           | 2 +-
 sci-libs/gotoblas2/metadata.xml                      | 2 +-
 sci-libs/gsl/metadata.xml                            | 2 +-
 sci-libs/iml/metadata.xml                            | 2 +-
 sci-libs/ipp/metadata.xml                            | 2 +-
 sci-libs/itk/metadata.xml                            | 4 ++--
 sci-libs/jhdf5/metadata.xml                          | 4 ++--
 sci-libs/k3match/metadata.xml                        | 4 ++--
 sci-libs/lapack-reference/metadata.xml               | 2 +-
 sci-libs/lapacke-reference/metadata.xml              | 2 +-
 sci-libs/lapackpp/metadata.xml                       | 2 +-
 sci-libs/libcgnsoo/metadata.xml                      | 2 +-
 sci-libs/libfac/metadata.xml                         | 4 ++--
 sci-libs/libgeodecomp/metadata.xml                   | 4 ++--
 sci-libs/libmatheval/metadata.xml                    | 4 ++--
 sci-libs/libmaus/metadata.xml                        | 2 +-
 sci-libs/libsc/metadata.xml                          | 4 ++--
 sci-libs/libspatialindex/metadata.xml                | 4 ++--
 sci-libs/libsufr/metadata.xml                        | 6 +++---
 sci-libs/libxc/metadata.xml                          | 2 +-
 sci-libs/lmfit/metadata.xml                          | 2 +-
 sci-libs/lwpr/metadata.xml                           | 2 +-
 sci-libs/matc/metadata.xml                           | 2 +-
 sci-libs/med/metadata.xml                            | 2 +-
 sci-libs/mesquite/metadata.xml                       | 2 +-
 sci-libs/mkl/metadata.xml                            | 2 +-
 sci-libs/mlpack/metadata.xml                         | 2 +-
 sci-libs/modglue/metadata.xml                        | 2 +-
 sci-libs/mpiblacs/metadata.xml                       | 2 +-
 sci-libs/msms/metadata.xml                           | 2 +-
 sci-libs/nexus/metadata.xml                          | 4 ++--
 sci-libs/ni-visa/metadata.xml                        | 2 +-
 sci-libs/nibabel/metadata.xml                        | 4 ++--
 sci-libs/nipy/metadata.xml                           | 4 ++--
 sci-libs/nipype/metadata.xml                         | 4 ++--
 sci-libs/o2scl/metadata.xml                          | 2 +-
 sci-libs/oasa/metadata.xml                           | 2 +-
 sci-libs/omalloc/metadata.xml                        | 4 ++--
 sci-libs/openblas/metadata.xml                       | 2 +-
 sci-libs/openlibm/metadata.xml                       | 2 +-
 sci-libs/optpp/metadata.xml                          | 2 +-
 sci-libs/p4est/metadata.xml                          | 4 ++--
 sci-libs/pagmo/metadata.xml                          | 2 +-
 sci-libs/parmetis/metadata.xml                       | 2 +-
 sci-libs/pastix/metadata.xml                         | 2 +-
 sci-libs/pfft/metadata.xml                           | 4 ++--
 sci-libs/pg2plplot/metadata.xml                      | 4 ++--
 sci-libs/plasma/metadata.xml                         | 2 +-
 sci-libs/pmx/metadata.xml                            | 2 +-
 sci-libs/pydicom/metadata.xml                        | 2 +-
 sci-libs/rdkit/metadata.xml                          | 4 ++--
 sci-libs/scalapack/metadata.xml                      | 2 +-
 sci-libs/scikits_image/metadata.xml                  | 2 +-
 sci-libs/spglib/metadata.xml                         | 4 ++--
 sci-libs/starparse/metadata.xml                      | 2 +-
 sci-libs/superlu_dist/metadata.xml                   | 2 +-
 sci-libs/superlu_mt/metadata.xml                     | 2 +-
 sci-libs/symengine/metadata.xml                      | 4 ++--
 sci-libs/symmetrica/metadata.xml                     | 2 +-
 sci-libs/tmglib/metadata.xml                         | 2 +-
 sci-libs/trilinos/metadata.xml                       | 4 ++--
 sci-libs/votca-tools/metadata.xml                    | 4 ++--
 sci-libs/vxl/metadata.xml                            | 2 +-
 sci-libs/wannier90/metadata.xml                      | 2 +-
 sci-libs/xblas/metadata.xml                          | 2 +-
 sci-libs/xraylib/metadata.xml                        | 4 ++--
 sci-libs/zarja/metadata.xml                          | 2 +-
 sci-mathematics/Macaulay2/metadata.xml               | 4 ++--
 sci-mathematics/Oid/metadata.xml                     | 4 ++--
 sci-mathematics/acl2/metadata.xml                    | 4 ++--
 sci-mathematics/alt-ergo/metadata.xml                | 2 +-
 sci-mathematics/apron/metadata.xml                   | 2 +-
 sci-mathematics/aribas/metadata.xml                  | 4 ++--
 sci-mathematics/axiom/metadata.xml                   | 2 +-
 sci-mathematics/burrtools/metadata.xml               | 2 +-
 sci-mathematics/cadabra/metadata.xml                 | 2 +-
 sci-mathematics/cdfplayer/metadata.xml               | 4 ++--
 sci-mathematics/cipi/metadata.xml                    | 4 ++--
 sci-mathematics/dolfin/metadata.xml                  | 2 +-
 sci-mathematics/dsfmt/metadata.xml                   | 2 +-
 sci-mathematics/flocq/metadata.xml                   | 2 +-
 sci-mathematics/frama-c/metadata.xml                 | 2 +-
 sci-mathematics/freefem++/metadata.xml               | 2 +-
 sci-mathematics/gambit/metadata.xml                  | 4 ++--
 sci-mathematics/gap/metadata.xml                     | 4 ++--
 sci-mathematics/gappa/metadata.xml                   | 2 +-
 sci-mathematics/gappalib-coq/metadata.xml            | 2 +-
 sci-mathematics/giac/metadata.xml                    | 2 +-
 sci-mathematics/gismo/metadata.xml                   | 2 +-
 sci-mathematics/htk/metadata.xml                     | 4 ++--
 sci-mathematics/kash-bin/metadata.xml                | 4 ++--
 sci-mathematics/kayali/metadata.xml                  | 2 +-
 sci-mathematics/lattE-macchiato/metadata.xml         | 4 ++--
 sci-mathematics/libsfmt/metadata.xml                 | 2 +-
 sci-mathematics/lie/metadata.xml                     | 2 +-
 sci-mathematics/ltl2ba/metadata.xml                  | 2 +-
 sci-mathematics/mdp/metadata.xml                     | 4 ++--
 sci-mathematics/netgen/metadata.xml                  | 2 +-
 sci-mathematics/open-axiom/metadata.xml              | 2 +-
 sci-mathematics/petsc/metadata.xml                   | 2 +-
 sci-mathematics/pff/metadata.xml                     | 2 +-
 sci-mathematics/pulp/metadata.xml                    | 2 +-
 sci-mathematics/scilab/metadata.xml                  | 2 +-
 sci-mathematics/surfer/metadata.xml                  | 2 +-
 sci-mathematics/tisean/metadata.xml                  | 2 +-
 sci-mathematics/ufc/metadata.xml                     | 2 +-
 sci-mathematics/why/metadata.xml                     | 2 +-
 sci-mathematics/why3/metadata.xml                    | 2 +-
 sci-mathematics/yorick/metadata.xml                  | 4 ++--
 sci-mathematics/z3/metadata.xml                      | 2 +-
 sci-misc/elmer-elmergrid/metadata.xml                | 2 +-
 sci-misc/elmer-fem/metadata.xml                      | 2 +-
 sci-misc/elmer-front/metadata.xml                    | 2 +-
 sci-misc/elmer-gui/metadata.xml                      | 2 +-
 sci-misc/elmer-meshgen2d/metadata.xml                | 2 +-
 sci-misc/elmer-meta/metadata.xml                     | 2 +-
 sci-misc/elmer-post/metadata.xml                     | 2 +-
 sci-misc/finomaton/metadata.xml                      | 2 +-
 sci-misc/fitscut/metadata.xml                        | 2 +-
 sci-misc/foma/metadata.xml                           | 2 +-
 sci-misc/irstlm/metadata.xml                         | 2 +-
 sci-misc/jwnl/metadata.xml                           | 2 +-
 sci-misc/kaldi/metadata.xml                          | 2 +-
 sci-misc/kotus-sanalista/metadata.xml                | 2 +-
 sci-misc/mitlm/metadata.xml                          | 2 +-
 sci-misc/nltk/metadata.xml                           | 2 +-
 sci-misc/omorfi/metadata.xml                         | 2 +-
 sci-misc/openfst/metadata.xml                        | 2 +-
 sci-misc/opennlp-maxent/metadata.xml                 | 2 +-
 sci-misc/praat/metadata.xml                          | 2 +-
 sci-misc/pywordnet/metadata.xml                      | 2 +-
 sci-misc/sfst/metadata.xml                           | 2 +-
 sci-misc/simx/metadata.xml                           | 2 +-
 sci-misc/stanford-parser/metadata.xml                | 2 +-
 sci-misc/stanford-tagger/metadata.xml                | 2 +-
 sci-physics/abinit/metadata.xml                      | 2 +-
 sci-physics/atompaw/metadata.xml                     | 4 ++--
 sci-physics/bigdft/metadata.xml                      | 2 +-
 sci-physics/elk/metadata.xml                         | 2 +-
 sci-physics/espresso++/metadata.xml                  | 4 ++--
 sci-physics/espresso/metadata.xml                    | 2 +-
 sci-physics/fullprof-bin/metadata.xml                | 4 ++--
 sci-physics/geant-vmc/metadata.xml                   | 2 +-
 sci-physics/genfit/metadata.xml                      | 2 +-
 sci-physics/herwig++/metadata.xml                    | 4 ++--
 sci-physics/hoomd-blue/metadata.xml                  | 4 ++--
 sci-physics/looptools/metadata.xml                   | 2 +-
 sci-physics/mc-tester/metadata.xml                   | 4 ++--
 sci-physics/openmx/metadata.xml                      | 2 +-
 sci-physics/qcl/metadata.xml                         | 4 ++--
 sci-physics/rivet/metadata.xml                       | 2 +-
 sci-physics/root/metadata.xml                        | 4 ++--
 sci-physics/tauola/metadata.xml                      | 4 ++--
 sci-physics/vgm/metadata.xml                         | 2 +-
 sci-physics/yoda/metadata.xml                        | 2 +-
 sci-visualization/forge/metadata.xml                 | 4 ++--
 sci-visualization/gnuplot/metadata.xml               | 6 +++---
 sci-visualization/mantid/metadata.xml                | 4 ++--
 sci-visualization/mayavi/metadata.xml                | 2 +-
 sci-visualization/nodemon/metadata.xml               | 4 ++--
 sci-visualization/v_sim/metadata.xml                 | 4 ++--
 sci-visualization/vtkPOFFReader/metadata.xml         | 2 +-
 sci-visualization/yt/metadata.xml                    | 4 ++--
 sys-cluster/blcr/metadata.xml                        | 2 +-
 sys-cluster/empi/metadata.xml                        | 4 ++--
 sys-cluster/ganglia_jobmonarch/metadata.xml          | 2 +-
 sys-cluster/gasnet/metadata.xml                      | 4 ++--
 sys-cluster/hpl/metadata.xml                         | 4 ++--
 sys-cluster/hpx/metadata.xml                         | 4 ++--
 sys-cluster/htcondor/metadata.xml                    | 4 ++--
 sys-cluster/libquo/metadata.xml                      | 4 ++--
 sys-cluster/lustre/metadata.xml                      | 2 +-
 sys-cluster/modules/metadata.xml                     | 4 ++--
 sys-cluster/mpe2/metadata.xml                        | 2 +-
 sys-cluster/mpich/metadata.xml                       | 6 +++---
 sys-cluster/mpich2/metadata.xml                      | 6 +++---
 sys-cluster/mvapich2/metadata.xml                    | 2 +-
 sys-cluster/nullmpi/metadata.xml                     | 4 ++--
 sys-cluster/openmpi/metadata.xml                     | 4 ++--
 sys-cluster/ovis/metadata.xml                        | 4 ++--
 sys-cluster/pyslice/metadata.xml                     | 2 +-
 sys-devel/gdebugger/metadata.xml                     | 4 ++--
 virtual/blacs/metadata.xml                           | 2 +-
 virtual/blas/metadata.xml                            | 2 +-
 virtual/cblas/metadata.xml                           | 2 +-
 virtual/geant/metadata.xml                           | 2 +-
 virtual/lapack/metadata.xml                          | 2 +-
 virtual/lapacke/metadata.xml                         | 2 +-
 virtual/mpi/metadata.xml                             | 2 +-
 virtual/perl-encoding-warnings/metadata.xml          | 2 +-
 virtual/scalapack/metadata.xml                       | 2 +-
 www-client/casperjs/metadata.xml                     | 2 +-
 x11-libs/agg/metadata.xml                            | 2 +-
 x11-libs/tr/metadata.xml                             | 2 +-
 x11-libs/xview-bin/metadata.xml                      | 4 ++--
 x11-libs/xview/metadata.xml                          | 4 ++--
 x11-misc/envytools/metadata.xml                      | 4 ++--
 813 files changed, 1203 insertions(+), 1203 deletions(-)

diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index 33d01aa..d3c30b4 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bicatali@gentoo.org</email>
   </maintainer>
 </pkgmetadata>

diff --git a/app-benchmarks/btl/metadata.xml b/app-benchmarks/btl/metadata.xml
index af3eaad..1276dc6 100644
--- a/app-benchmarks/btl/metadata.xml
+++ b/app-benchmarks/btl/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>andyspiros@gmail.com</email>
     <name>Andrea Arteaga</name>
     <description>Bench Template Library</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/app-benchmarks/numbench/metadata.xml b/app-benchmarks/numbench/metadata.xml
index 366e31c..810ffee 100644
--- a/app-benchmarks/numbench/metadata.xml
+++ b/app-benchmarks/numbench/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>andyspiros@gmail.com</email>
     <name>Andrea Arteaga</name>
     <description>Google Summer of Code 2011 student</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/app-doc/blacs-docs/metadata.xml b/app-doc/blacs-docs/metadata.xml
index b6a7ed3..49201a4 100644
--- a/app-doc/blacs-docs/metadata.xml
+++ b/app-doc/blacs-docs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/app-doc/blas-docs/metadata.xml b/app-doc/blas-docs/metadata.xml
index 321ad41..a7f7415 100644
--- a/app-doc/blas-docs/metadata.xml
+++ b/app-doc/blas-docs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/app-doc/lapack-docs/metadata.xml b/app-doc/lapack-docs/metadata.xml
index 81cbdde..5418d03 100644
--- a/app-doc/lapack-docs/metadata.xml
+++ b/app-doc/lapack-docs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 3d3ffb2..47caabb 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/app-doc/scalapack-docs/metadata.xml b/app-doc/scalapack-docs/metadata.xml
index 284a8a2..f7fa9c1 100644
--- a/app-doc/scalapack-docs/metadata.xml
+++ b/app-doc/scalapack-docs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/app-forensics/vine/metadata.xml b/app-forensics/vine/metadata.xml
index 06c3d15..cabecde 100644
--- a/app-forensics/vine/metadata.xml
+++ b/app-forensics/vine/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>

diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index 33a64d2..d8ba483 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>rafael@rafaelmartins.eng.br</email>
     <name>Rafael Goncalves Martins</name>
   </maintainer>

diff --git a/app-text/dgs/metadata.xml b/app-text/dgs/metadata.xml
index 721f543..8425c0d 100644
--- a/app-text/dgs/metadata.xml
+++ b/app-text/dgs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/app-vim/vim-gromacs/metadata.xml b/app-vim/vim-gromacs/metadata.xml
index 5b0b42e..704b2eb 100644
--- a/app-vim/vim-gromacs/metadata.xml
+++ b/app-vim/vim-gromacs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index 0f1ab73..6d5cb66 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-cpp/growler-arch/metadata.xml b/dev-cpp/growler-arch/metadata.xml
index d212cf7..6ddf363 100644
--- a/dev-cpp/growler-arch/metadata.xml
+++ b/dev-cpp/growler-arch/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/growler-core/metadata.xml b/dev-cpp/growler-core/metadata.xml
index cdb443f..d3ff5e9 100644
--- a/dev-cpp/growler-core/metadata.xml
+++ b/dev-cpp/growler-core/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/growler-link/metadata.xml b/dev-cpp/growler-link/metadata.xml
index cec0009..b436d6b 100644
--- a/dev-cpp/growler-link/metadata.xml
+++ b/dev-cpp/growler-link/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/growler-math/metadata.xml b/dev-cpp/growler-math/metadata.xml
index 8bd12df..4f4b880 100644
--- a/dev-cpp/growler-math/metadata.xml
+++ b/dev-cpp/growler-math/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/growler-thread/metadata.xml b/dev-cpp/growler-thread/metadata.xml
index 0b2dfa3..13e10be 100644
--- a/dev-cpp/growler-thread/metadata.xml
+++ b/dev-cpp/growler-thread/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/growler/metadata.xml b/dev-cpp/growler/metadata.xml
index 081b023..ebad088 100644
--- a/dev-cpp/growler/metadata.xml
+++ b/dev-cpp/growler/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bryan.d.green@nasa.gov</email>
     <name>Bryan Green</name>
   </maintainer>

diff --git a/dev-cpp/icnc/metadata.xml b/dev-cpp/icnc/metadata.xml
index c3e80bd..4ab9fc6 100644
--- a/dev-cpp/icnc/metadata.xml
+++ b/dev-cpp/icnc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>

diff --git a/dev-java/fits/metadata.xml b/dev-java/fits/metadata.xml
index eb91a63..aab84e6 100644
--- a/dev-java/fits/metadata.xml
+++ b/dev-java/fits/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/flexdock/metadata.xml b/dev-java/flexdock/metadata.xml
index 5b3848c..f864524 100644
--- a/dev-java/flexdock/metadata.xml
+++ b/dev-java/flexdock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/gluegen/metadata.xml b/dev-java/gluegen/metadata.xml
index 9281a76..9fc3e6b 100644
--- a/dev-java/gluegen/metadata.xml
+++ b/dev-java/gluegen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/hdf-java/metadata.xml b/dev-java/hdf-java/metadata.xml
index 8f355a3..16cedf5 100644
--- a/dev-java/hdf-java/metadata.xml
+++ b/dev-java/hdf-java/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/jeuclid-core/metadata.xml b/dev-java/jeuclid-core/metadata.xml
index 8c75568..5e60bad 100644
--- a/dev-java/jeuclid-core/metadata.xml
+++ b/dev-java/jeuclid-core/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/jgraphx/metadata.xml b/dev-java/jgraphx/metadata.xml
index 8dcdd82..ffe33e8 100644
--- a/dev-java/jgraphx/metadata.xml
+++ b/dev-java/jgraphx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/jhealpix/metadata.xml b/dev-java/jhealpix/metadata.xml
index 4f57f2a..00602ea 100644
--- a/dev-java/jhealpix/metadata.xml
+++ b/dev-java/jhealpix/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-java/jlatexmath-fop/metadata.xml b/dev-java/jlatexmath-fop/metadata.xml
index 664b6c4..a5ee940 100644
--- a/dev-java/jlatexmath-fop/metadata.xml
+++ b/dev-java/jlatexmath-fop/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/dev-java/jlatexmath/metadata.xml b/dev-java/jlatexmath/metadata.xml
index 04fbf5a..e2085e4 100644
--- a/dev-java/jlatexmath/metadata.xml
+++ b/dev-java/jlatexmath/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/dev-java/jogl/metadata.xml b/dev-java/jogl/metadata.xml
index fa04086..6a8c704 100644
--- a/dev-java/jogl/metadata.xml
+++ b/dev-java/jogl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/jrosetta/metadata.xml b/dev-java/jrosetta/metadata.xml
index 3317f16..ae9640f 100644
--- a/dev-java/jrosetta/metadata.xml
+++ b/dev-java/jrosetta/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-java/netcdf/metadata.xml b/dev-java/netcdf/metadata.xml
index d4b8f72..540e5d7 100644
--- a/dev-java/netcdf/metadata.xml
+++ b/dev-java/netcdf/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-java/scirenderer/metadata.xml b/dev-java/scirenderer/metadata.xml
index b533dd9..c554751 100644
--- a/dev-java/scirenderer/metadata.xml
+++ b/dev-java/scirenderer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-lang/berkeley_upc/metadata.xml b/dev-lang/berkeley_upc/metadata.xml
index 62031e3..1ebc1d2 100644
--- a/dev-lang/berkeley_upc/metadata.xml
+++ b/dev-lang/berkeley_upc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>

diff --git a/dev-lang/berkeley_upc_translator/metadata.xml b/dev-lang/berkeley_upc_translator/metadata.xml
index 0b7db93..f7d539e 100644
--- a/dev-lang/berkeley_upc_translator/metadata.xml
+++ b/dev-lang/berkeley_upc_translator/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>

diff --git a/dev-lang/conceptual/metadata.xml b/dev-lang/conceptual/metadata.xml
index 35143c2..bf09c65 100644
--- a/dev-lang/conceptual/metadata.xml
+++ b/dev-lang/conceptual/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>

diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml
index ec21809..626352b 100644
--- a/dev-lang/icc/metadata.xml
+++ b/dev-lang/icc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-lang/idb/metadata.xml b/dev-lang/idb/metadata.xml
index 29a46be..af02a68 100644
--- a/dev-lang/idb/metadata.xml
+++ b/dev-lang/idb/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-lang/ifc/metadata.xml b/dev-lang/ifc/metadata.xml
index 5d587d8..b545fb9 100644
--- a/dev-lang/ifc/metadata.xml
+++ b/dev-lang/ifc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-lang/ispc/metadata.xml b/dev-lang/ispc/metadata.xml
index 4663d3a..2010b02 100644
--- a/dev-lang/ispc/metadata.xml
+++ b/dev-lang/ispc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 4af13a2..93a48b3 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-lang/path64/metadata.xml b/dev-lang/path64/metadata.xml
index f450895..ee1012f 100644
--- a/dev-lang/path64/metadata.xml
+++ b/dev-lang/path64/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>

diff --git a/dev-lang/pgi/metadata.xml b/dev-lang/pgi/metadata.xml
index 5b08fff..76552d4 100644
--- a/dev-lang/pgi/metadata.xml
+++ b/dev-lang/pgi/metadata.xml
@@ -4,10 +4,10 @@
   <longdescription>
 	PGI is the C/C++/Fortran compiler suite of the Portland Group.
   </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/dev-lang/terra/metadata.xml b/dev-lang/terra/metadata.xml
index 2e41c46..7fa6fee 100644
--- a/dev-lang/terra/metadata.xml
+++ b/dev-lang/terra/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>

diff --git a/dev-lang/vtune/metadata.xml b/dev-lang/vtune/metadata.xml
index 1187461..18adbb0 100644
--- a/dev-lang/vtune/metadata.xml
+++ b/dev-lang/vtune/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>nbigaouette@gmail.com</email>
     <name>Nicolas Bigaouette</name>
   </maintainer>

diff --git a/dev-libs/asmjit/metadata.xml b/dev-libs/asmjit/metadata.xml
index 633deb6..b86ea1d 100644
--- a/dev-libs/asmjit/metadata.xml
+++ b/dev-libs/asmjit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-libs/boost-compute/metadata.xml b/dev-libs/boost-compute/metadata.xml
index 0d4aa20..f46139c 100644
--- a/dev-libs/boost-compute/metadata.xml
+++ b/dev-libs/boost-compute/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-libs/fortrancl/metadata.xml b/dev-libs/fortrancl/metadata.xml
index 8241e62..b46223c 100644
--- a/dev-libs/fortrancl/metadata.xml
+++ b/dev-libs/fortrancl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index 3e849d6..b689904 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index f760b51..8b29a8e 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
+    <maintainer type="project">
         <email>sci@gentoo.org</email>
         <name>Gentoo Science Project</name>
     </maintainer>

diff --git a/dev-libs/libcuda/metadata.xml b/dev-libs/libcuda/metadata.xml
index f78356f..1577ca2 100644
--- a/dev-libs/libcuda/metadata.xml
+++ b/dev-libs/libcuda/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>

diff --git a/dev-libs/libflatarray/metadata.xml b/dev-libs/libflatarray/metadata.xml
index 98a6bf6..994e032 100644
--- a/dev-libs/libflatarray/metadata.xml
+++ b/dev-libs/libflatarray/metadata.xml
@@ -7,10 +7,10 @@
     internally storing data in a struct of arrays (SoA) manner. It
     comes with utilities to move data to CUDA enabled GPUs.
   </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/dev-libs/libgdev/metadata.xml b/dev-libs/libgdev/metadata.xml
index f78356f..1577ca2 100644
--- a/dev-libs/libgdev/metadata.xml
+++ b/dev-libs/libgdev/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>

diff --git a/dev-libs/mxml/metadata.xml b/dev-libs/mxml/metadata.xml
index 7176399..e769ed6 100644
--- a/dev-libs/mxml/metadata.xml
+++ b/dev-libs/mxml/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>cjk34@cam.ac.uk</email>
   <name>Chris Kerr</name>
   <description>I don't develop this software, I'm just a Gentoo user who
     wanted to install it</description>
 </maintainer>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/dev-libs/simclist/metadata.xml b/dev-libs/simclist/metadata.xml
index 9aad0a0..bbcd467 100644
--- a/dev-libs/simclist/metadata.xml
+++ b/dev-libs/simclist/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml
index 14f64a1..e254e53 100644
--- a/dev-libs/utf8proc/metadata.xml
+++ b/dev-libs/utf8proc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
index aa769e8..4fb2e67 100644
--- a/dev-ml/gsl-ocaml/metadata.xml
+++ b/dev-ml/gsl-ocaml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-ml/lacaml/metadata.xml b/dev-ml/lacaml/metadata.xml
index ac5be3a..e5248b9 100644
--- a/dev-ml/lacaml/metadata.xml
+++ b/dev-ml/lacaml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-ml/mlgmpidl/metadata.xml b/dev-ml/mlgmpidl/metadata.xml
index 4c60013..0c26294 100644
--- a/dev-ml/mlgmpidl/metadata.xml
+++ b/dev-ml/mlgmpidl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index ce7691d..e8c58a4 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/dev-perl/BTLib/metadata.xml b/dev-perl/BTLib/metadata.xml
index baf54e9..c928da2 100644
--- a/dev-perl/BTLib/metadata.xml
+++ b/dev-perl/BTLib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/Bio-BigFile/metadata.xml b/dev-perl/Bio-BigFile/metadata.xml
index 5b9a598..1d67411 100644
--- a/dev-perl/Bio-BigFile/metadata.xml
+++ b/dev-perl/Bio-BigFile/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/dev-perl/Bio-DB-Das-Chado/metadata.xml b/dev-perl/Bio-DB-Das-Chado/metadata.xml
index 5b9a598..1d67411 100644
--- a/dev-perl/Bio-DB-Das-Chado/metadata.xml
+++ b/dev-perl/Bio-DB-Das-Chado/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/dev-perl/DBIx-DBStag/metadata.xml b/dev-perl/DBIx-DBStag/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-perl/DBIx-DBStag/metadata.xml
+++ b/dev-perl/DBIx-DBStag/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/Lab-Instrument/metadata.xml b/dev-perl/Lab-Instrument/metadata.xml
index 5e7df8a..d7298d7 100644
--- a/dev-perl/Lab-Instrument/metadata.xml
+++ b/dev-perl/Lab-Instrument/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mail@akhuettel.de</email>
   </maintainer>
 </pkgmetadata>

diff --git a/dev-perl/Lab-VISA/metadata.xml b/dev-perl/Lab-VISA/metadata.xml
index 5e7df8a..d7298d7 100644
--- a/dev-perl/Lab-VISA/metadata.xml
+++ b/dev-perl/Lab-VISA/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mail@akhuettel.de</email>
   </maintainer>
 </pkgmetadata>

diff --git a/dev-perl/Log-Cabin/metadata.xml b/dev-perl/Log-Cabin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-perl/Log-Cabin/metadata.xml
+++ b/dev-perl/Log-Cabin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/Text-ParseWords/metadata.xml b/dev-perl/Text-ParseWords/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-perl/Text-ParseWords/metadata.xml
+++ b/dev-perl/Text-ParseWords/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/Time-Progress/metadata.xml b/dev-perl/Time-Progress/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-perl/Time-Progress/metadata.xml
+++ b/dev-perl/Time-Progress/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/go-db-perl/metadata.xml b/dev-perl/go-db-perl/metadata.xml
index 8b0589b..959160f 100644
--- a/dev-perl/go-db-perl/metadata.xml
+++ b/dev-perl/go-db-perl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/go-perl/metadata.xml b/dev-perl/go-perl/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-perl/go-perl/metadata.xml
+++ b/dev-perl/go-perl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-perl/opal-client/metadata.xml b/dev-perl/opal-client/metadata.xml
index e8d8965..5f29f06 100644
--- a/dev-perl/opal-client/metadata.xml
+++ b/dev-perl/opal-client/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/Forthon/metadata.xml b/dev-python/Forthon/metadata.xml
index 114375b..989e062 100644
--- a/dev-python/Forthon/metadata.xml
+++ b/dev-python/Forthon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>

diff --git a/dev-python/GOGrapher/metadata.xml b/dev-python/GOGrapher/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-python/GOGrapher/metadata.xml
+++ b/dev-python/GOGrapher/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-python/PeakUtils/metadata.xml b/dev-python/PeakUtils/metadata.xml
index 16641fe..c39ab9b 100644
--- a/dev-python/PeakUtils/metadata.xml
+++ b/dev-python/PeakUtils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/RecSQL/metadata.xml b/dev-python/RecSQL/metadata.xml
index 16a22c3..c0ad26b 100644
--- a/dev-python/RecSQL/metadata.xml
+++ b/dev-python/RecSQL/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/arrayfire-python/metadata.xml b/dev-python/arrayfire-python/metadata.xml
index 05ce0c4..18b1016 100644
--- a/dev-python/arrayfire-python/metadata.xml
+++ b/dev-python/arrayfire-python/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/astlib/metadata.xml b/dev-python/astlib/metadata.xml
index c3c3be6..acde5ae 100644
--- a/dev-python/astlib/metadata.xml
+++ b/dev-python/astlib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
index f9e45b5..9dffe2e 100644
--- a/dev-python/astropy-helpers/metadata.xml
+++ b/dev-python/astropy-helpers/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
index d40e7f0..eddb62a 100644
--- a/dev-python/astropy/metadata.xml
+++ b/dev-python/astropy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/astropysics/metadata.xml b/dev-python/astropysics/metadata.xml
index 36bc5a2..1472408 100644
--- a/dev-python/astropysics/metadata.xml
+++ b/dev-python/astropysics/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/astroquery/metadata.xml b/dev-python/astroquery/metadata.xml
index 0b4f771..224276a 100644
--- a/dev-python/astroquery/metadata.xml
+++ b/dev-python/astroquery/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/brewer2mpl/metadata.xml b/dev-python/brewer2mpl/metadata.xml
index 4b0f9fa..4f2cd15 100644
--- a/dev-python/brewer2mpl/metadata.xml
+++ b/dev-python/brewer2mpl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ccdproc/metadata.xml b/dev-python/ccdproc/metadata.xml
index 8b0ffc0..a254a57 100644
--- a/dev-python/ccdproc/metadata.xml
+++ b/dev-python/ccdproc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/coards/metadata.xml b/dev-python/coards/metadata.xml
index a94fb6c..34578d1 100644
--- a/dev-python/coards/metadata.xml
+++ b/dev-python/coards/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>

diff --git a/dev-python/coords/metadata.xml b/dev-python/coords/metadata.xml
index 91b345c..94198d2 100644
--- a/dev-python/coords/metadata.xml
+++ b/dev-python/coords/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/cosmocalc/metadata.xml b/dev-python/cosmocalc/metadata.xml
index 31aa6e7..3563ced 100644
--- a/dev-python/cosmocalc/metadata.xml
+++ b/dev-python/cosmocalc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/dimensionful/metadata.xml b/dev-python/dimensionful/metadata.xml
index ecf6df5..310bd05 100644
--- a/dev-python/dimensionful/metadata.xml
+++ b/dev-python/dimensionful/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>

diff --git a/dev-python/emcee/metadata.xml b/dev-python/emcee/metadata.xml
index abe0c9e..04a1931 100644
--- a/dev-python/emcee/metadata.xml
+++ b/dev-python/emcee/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ffc/metadata.xml b/dev-python/ffc/metadata.xml
index 5ddcd16..c18ab87 100644
--- a/dev-python/ffc/metadata.xml
+++ b/dev-python/ffc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-python/ffnet/metadata.xml b/dev-python/ffnet/metadata.xml
index 991456e..0de1819 100644
--- a/dev-python/ffnet/metadata.xml
+++ b/dev-python/ffnet/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/fiat/metadata.xml b/dev-python/fiat/metadata.xml
index ed085f0..c28ae4e 100644
--- a/dev-python/fiat/metadata.xml
+++ b/dev-python/fiat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml
index cd66018..6281acd 100644
--- a/dev-python/future/metadata.xml
+++ b/dev-python/future/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/gammapy/metadata.xml b/dev-python/gammapy/metadata.xml
index 0c549cd..413f49b 100644
--- a/dev-python/gammapy/metadata.xml
+++ b/dev-python/gammapy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/healpy/metadata.xml b/dev-python/healpy/metadata.xml
index d6092ed..b279857 100644
--- a/dev-python/healpy/metadata.xml
+++ b/dev-python/healpy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/imageutils/metadata.xml b/dev-python/imageutils/metadata.xml
index 3a9581a..90af042 100644
--- a/dev-python/imageutils/metadata.xml
+++ b/dev-python/imageutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/inference/metadata.xml b/dev-python/inference/metadata.xml
index d2c3a22..f93f348 100644
--- a/dev-python/inference/metadata.xml
+++ b/dev-python/inference/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/instant/metadata.xml b/dev-python/instant/metadata.xml
index a9c2d0c..b3c7ae9 100644
--- a/dev-python/instant/metadata.xml
+++ b/dev-python/instant/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 64ab2af..973783b 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 4f74e74..4734892 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
index cf59b9b..c9deb0b 100644
--- a/dev-python/ipython_genutils/metadata.xml
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
index e4bdec4..8bc5199 100644
--- a/dev-python/ipywidgets/metadata.xml
+++ b/dev-python/ipywidgets/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index f4f0e38..53a086c 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 41a71d9..6fc0fef 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index 0f31934..467bb37 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/matlab_wrapper/metadata.xml b/dev-python/matlab_wrapper/metadata.xml
index 5daa515..bad1f38 100644
--- a/dev-python/matlab_wrapper/metadata.xml
+++ b/dev-python/matlab_wrapper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/matplotlib-venn/metadata.xml b/dev-python/matplotlib-venn/metadata.xml
index 875de68..01447d8 100644
--- a/dev-python/matplotlib-venn/metadata.xml
+++ b/dev-python/matplotlib-venn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
index e4b6e2b..7d7b3f2 100644
--- a/dev-python/matplotlib2tikz/metadata.xml
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/matrix2latex/metadata.xml b/dev-python/matrix2latex/metadata.xml
index 5c6c305..b8ecd8d 100644
--- a/dev-python/matrix2latex/metadata.xml
+++ b/dev-python/matrix2latex/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-python/meshpy/metadata.xml b/dev-python/meshpy/metadata.xml
index fbc4d71..d5be6ad 100644
--- a/dev-python/meshpy/metadata.xml
+++ b/dev-python/meshpy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/metakernel/metadata.xml b/dev-python/metakernel/metadata.xml
index d4c9d62..98f5e48 100644
--- a/dev-python/metakernel/metadata.xml
+++ b/dev-python/metakernel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/metakernel_bash/metadata.xml b/dev-python/metakernel_bash/metadata.xml
index 5c2a3e6..105ab46 100644
--- a/dev-python/metakernel_bash/metadata.xml
+++ b/dev-python/metakernel_bash/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/metakernel_python/metadata.xml b/dev-python/metakernel_python/metadata.xml
index 55019e1..2aed176 100644
--- a/dev-python/metakernel_python/metadata.xml
+++ b/dev-python/metakernel_python/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/montage-wrapper/metadata.xml b/dev-python/montage-wrapper/metadata.xml
index 91dacad..aa3e481 100644
--- a/dev-python/montage-wrapper/metadata.xml
+++ b/dev-python/montage-wrapper/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index 79eba35..10cd410 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
index 8a23aee..6bd91de 100644
--- a/dev-python/nbformat/metadata.xml
+++ b/dev-python/nbformat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/nbviewer/metadata.xml b/dev-python/nbviewer/metadata.xml
index 6cc84ef..3b58897 100644
--- a/dev-python/nbviewer/metadata.xml
+++ b/dev-python/nbviewer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/newrelic/metadata.xml b/dev-python/newrelic/metadata.xml
index 90585b0..442e040 100644
--- a/dev-python/newrelic/metadata.xml
+++ b/dev-python/newrelic/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 7ce2187..2751ca0 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/nvidia-ml-py/metadata.xml b/dev-python/nvidia-ml-py/metadata.xml
index 3cf094b..5e6d9d8 100644
--- a/dev-python/nvidia-ml-py/metadata.xml
+++ b/dev-python/nvidia-ml-py/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/omniorbpy/metadata.xml b/dev-python/omniorbpy/metadata.xml
index 0c313ad..f3506b4 100644
--- a/dev-python/omniorbpy/metadata.xml
+++ b/dev-python/omniorbpy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/opal-client/metadata.xml b/dev-python/opal-client/metadata.xml
index 9d848bc..28e2fc5 100644
--- a/dev-python/opal-client/metadata.xml
+++ b/dev-python/opal-client/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-python/pamela/metadata.xml b/dev-python/pamela/metadata.xml
index c53b393..d1dc0c2 100644
--- a/dev-python/pamela/metadata.xml
+++ b/dev-python/pamela/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/photutils/metadata.xml b/dev-python/photutils/metadata.xml
index 20da88b..b5ab4d7 100644
--- a/dev-python/photutils/metadata.xml
+++ b/dev-python/photutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
index 6e4a88d..5d8abb4 100644
--- a/dev-python/pickleshare/metadata.xml
+++ b/dev-python/pickleshare/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/prettyplotlib/metadata.xml b/dev-python/prettyplotlib/metadata.xml
index 621e56c..752a7a1 100644
--- a/dev-python/prettyplotlib/metadata.xml
+++ b/dev-python/prettyplotlib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>

diff --git a/dev-python/psubprocess/metadata.xml b/dev-python/psubprocess/metadata.xml
index 49ba8f4..1699e58 100644
--- a/dev-python/psubprocess/metadata.xml
+++ b/dev-python/psubprocess/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/dev-python/ptyprocess/metadata.xml b/dev-python/ptyprocess/metadata.xml
index 997bbe3..3ff841f 100644
--- a/dev-python/ptyprocess/metadata.xml
+++ b/dev-python/ptyprocess/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pyfftw/metadata.xml b/dev-python/pyfftw/metadata.xml
index cb18bc6..0392748 100644
--- a/dev-python/pyfftw/metadata.xml
+++ b/dev-python/pyfftw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pyhdf/metadata.xml b/dev-python/pyhdf/metadata.xml
index e8ac64b..bc7e4ea 100644
--- a/dev-python/pyhdf/metadata.xml
+++ b/dev-python/pyhdf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>gorkypl@gmail.com</email>
     <name>Paweł Rumian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pylibconfig2/metadata.xml b/dev-python/pylibconfig2/metadata.xml
index e1d002e..ddcf657 100644
--- a/dev-python/pylibconfig2/metadata.xml
+++ b/dev-python/pylibconfig2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pymvpa/metadata.xml b/dev-python/pymvpa/metadata.xml
index 324c435..124cd9d 100644
--- a/dev-python/pymvpa/metadata.xml
+++ b/dev-python/pymvpa/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/dev-python/pynomo/metadata.xml b/dev-python/pynomo/metadata.xml
index 4218351..0ece820 100644
--- a/dev-python/pynomo/metadata.xml
+++ b/dev-python/pynomo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>witold.pilat@gmail.com</email>
   </maintainer>
   <longdescription>

diff --git a/dev-python/pysolar/metadata.xml b/dev-python/pysolar/metadata.xml
index e4126cd..a799689 100644
--- a/dev-python/pysolar/metadata.xml
+++ b/dev-python/pysolar/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/pysparse/metadata.xml b/dev-python/pysparse/metadata.xml
index b86bd15..50412f4 100644
--- a/dev-python/pysparse/metadata.xml
+++ b/dev-python/pysparse/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/python-ivi/metadata.xml b/dev-python/python-ivi/metadata.xml
index 4955779..9d59c03 100644
--- a/dev-python/python-ivi/metadata.xml
+++ b/dev-python/python-ivi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/python-vxi11/metadata.xml b/dev-python/python-vxi11/metadata.xml
index 41a23d0..095fd53 100644
--- a/dev-python/python-vxi11/metadata.xml
+++ b/dev-python/python-vxi11/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pythoncgns/metadata.xml b/dev-python/pythoncgns/metadata.xml
index 8d0e1de..116c8c0 100644
--- a/dev-python/pythoncgns/metadata.xml
+++ b/dev-python/pythoncgns/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pythonocc/metadata.xml b/dev-python/pythonocc/metadata.xml
index 721f543..8425c0d 100644
--- a/dev-python/pythonocc/metadata.xml
+++ b/dev-python/pythonocc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pythonqt/metadata.xml b/dev-python/pythonqt/metadata.xml
index a30ce23..e44f1d0 100644
--- a/dev-python/pythonqt/metadata.xml
+++ b/dev-python/pythonqt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/pywcsgrid2/metadata.xml b/dev-python/pywcsgrid2/metadata.xml
index 4cacac9..4291064 100644
--- a/dev-python/pywcsgrid2/metadata.xml
+++ b/dev-python/pywcsgrid2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-astronomy@gentoo.org</email>
 		<name>Gentoo Astronomy Project</name>
 	</maintainer>

diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index 97f34fc..83b712f 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/snakemake/metadata.xml b/dev-python/snakemake/metadata.xml
index 3139fe5..63e701e 100644
--- a/dev-python/snakemake/metadata.xml
+++ b/dev-python/snakemake/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>

diff --git a/dev-python/specutils/metadata.xml b/dev-python/specutils/metadata.xml
index 9c49f61..15cc638 100644
--- a/dev-python/specutils/metadata.xml
+++ b/dev-python/specutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index df4fd5f..00019a0 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index 31de8f7..cba9cbf 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
index 1353db6..fa50e61 100644
--- a/dev-python/traitlets/metadata.xml
+++ b/dev-python/traitlets/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-python/ufl/metadata.xml b/dev-python/ufl/metadata.xml
index b8182f8..7505450 100644
--- a/dev-python/ufl/metadata.xml
+++ b/dev-python/ufl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-python/viper/metadata.xml b/dev-python/viper/metadata.xml
index 47d95ba..430a785 100644
--- a/dev-python/viper/metadata.xml
+++ b/dev-python/viper/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-tcltk/img_rotate/metadata.xml b/dev-tcltk/img_rotate/metadata.xml
index 47d11b6..f1310b4 100644
--- a/dev-tcltk/img_rotate/metadata.xml
+++ b/dev-tcltk/img_rotate/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-tcltk/togl/metadata.xml b/dev-tcltk/togl/metadata.xml
index def6254..d19c9b2 100644
--- a/dev-tcltk/togl/metadata.xml
+++ b/dev-tcltk/togl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-tex/pythontex/metadata.xml b/dev-tex/pythontex/metadata.xml
index fa4bf0b..17dc4a8 100644
--- a/dev-tex/pythontex/metadata.xml
+++ b/dev-tex/pythontex/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-util/VampirTrace/metadata.xml b/dev-util/VampirTrace/metadata.xml
index f9db879..925a26d 100644
--- a/dev-util/VampirTrace/metadata.xml
+++ b/dev-util/VampirTrace/metadata.xml
@@ -4,10 +4,10 @@
   <longdescription>
     VampirTrace is an open source library that allows detailed logging of program execution for parallel applications using message passing (MPI) and threads (OpenMP), Pthreads). Besides these typical parallelization paradigms, VampirTrace is capable of tracing GPU accelerated applications and generates exact time stamps for all GPU related events.
   </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/dev-util/amdapp/metadata.xml b/dev-util/amdapp/metadata.xml
index e1bc9a4..c26897c 100644
--- a/dev-util/amdapp/metadata.xml
+++ b/dev-util/amdapp/metadata.xml
@@ -5,10 +5,10 @@
 	AMD Accelerated Parallel Processing (APP) is an SDK which includes
 	the Bolt libraries and an OpenCL implementation for AMD's CPUs and GPUs.
   </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/dev-util/emscripten-fastcomp/metadata.xml b/dev-util/emscripten-fastcomp/metadata.xml
index c517ec5..d9e7096 100644
--- a/dev-util/emscripten-fastcomp/metadata.xml
+++ b/dev-util/emscripten-fastcomp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>harald.weiner@jku.at</email>
 		<name>Harald Weiner</name>
 	</maintainer>

diff --git a/dev-util/emscripten/metadata.xml b/dev-util/emscripten/metadata.xml
index c517ec5..d9e7096 100644
--- a/dev-util/emscripten/metadata.xml
+++ b/dev-util/emscripten/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>harald.weiner@jku.at</email>
 		<name>Harald Weiner</name>
 	</maintainer>

diff --git a/dev-util/f90cache/metadata.xml b/dev-util/f90cache/metadata.xml
index 745b9e1..9dee8db 100644
--- a/dev-util/f90cache/metadata.xml
+++ b/dev-util/f90cache/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>

diff --git a/dev-util/ndiff/metadata.xml b/dev-util/ndiff/metadata.xml
index f5b26e2..cf0cf4a 100644
--- a/dev-util/ndiff/metadata.xml
+++ b/dev-util/ndiff/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>AstroFloyd@gmail.com</email>
 		<name>AstroFloyd</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/dev-util/numdiff/metadata.xml b/dev-util/numdiff/metadata.xml
index 0641ab4..dc54628 100644
--- a/dev-util/numdiff/metadata.xml
+++ b/dev-util/numdiff/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tamiko+GENTOO@kyomu.43-1.org</email>
     <name>Matthias Maier</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/dev-util/nvidia-cuda-gdk/metadata.xml b/dev-util/nvidia-cuda-gdk/metadata.xml
index 4e13bb7..fea84f5 100644
--- a/dev-util/nvidia-cuda-gdk/metadata.xml
+++ b/dev-util/nvidia-cuda-gdk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/media-gfx/PhiloGL/metadata.xml b/media-gfx/PhiloGL/metadata.xml
index ef58ee2..06dd1e4 100644
--- a/media-gfx/PhiloGL/metadata.xml
+++ b/media-gfx/PhiloGL/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>

diff --git a/media-gfx/brlcad/metadata.xml b/media-gfx/brlcad/metadata.xml
index 116d6fa..fd09133 100644
--- a/media-gfx/brlcad/metadata.xml
+++ b/media-gfx/brlcad/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>dongxuli2011@gmail.com</email>
     <description>please assign bugs</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>dilfridge@gentoo.org</email>
     <description>proxy-maintainer, please cc on bugs</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index d34c73e..56059e4 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>slis@gentoo.org</email>
   </maintainer>
   <use>

diff --git a/media-libs/OpenMOIV/metadata.xml b/media-libs/OpenMOIV/metadata.xml
index f7bb205..0c6991d 100644
--- a/media-libs/OpenMOIV/metadata.xml
+++ b/media-libs/OpenMOIV/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/media-libs/avbin-bin/metadata.xml b/media-libs/avbin-bin/metadata.xml
index c8fb357..f48f5ea 100644
--- a/media-libs/avbin-bin/metadata.xml
+++ b/media-libs/avbin-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/media-libs/libgfx/metadata.xml b/media-libs/libgfx/metadata.xml
index 3317f16..ae9640f 100644
--- a/media-libs/libgfx/metadata.xml
+++ b/media-libs/libgfx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/net-ftp/bbftp-client/metadata.xml b/net-ftp/bbftp-client/metadata.xml
index 46adbee..f80d23e 100644
--- a/net-ftp/bbftp-client/metadata.xml
+++ b/net-ftp/bbftp-client/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/net-ftp/bbftp-server/metadata.xml b/net-ftp/bbftp-server/metadata.xml
index 46adbee..f80d23e 100644
--- a/net-ftp/bbftp-server/metadata.xml
+++ b/net-ftp/bbftp-server/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/net-misc/bbscp/metadata.xml b/net-misc/bbscp/metadata.xml
index 683d55f..bde1b72 100644
--- a/net-misc/bbscp/metadata.xml
+++ b/net-misc/bbscp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/perl-core/encoding-warnings/metadata.xml b/perl-core/encoding-warnings/metadata.xml
index 5e7df8a..d7298d7 100644
--- a/perl-core/encoding-warnings/metadata.xml
+++ b/perl-core/encoding-warnings/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mail@akhuettel.de</email>
   </maintainer>
 </pkgmetadata>

diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml
index 778d400..70d2867 100644
--- a/sci-astronomy/astrometry/metadata.xml
+++ b/sci-astronomy/astrometry/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/bpz/metadata.xml b/sci-astronomy/bpz/metadata.xml
index b6754e8..8eb205b 100644
--- a/sci-astronomy/bpz/metadata.xml
+++ b/sci-astronomy/bpz/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/casapy-bin/metadata.xml b/sci-astronomy/casapy-bin/metadata.xml
index a791c74..fdf3ea3 100644
--- a/sci-astronomy/casapy-bin/metadata.xml
+++ b/sci-astronomy/casapy-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-astronomy@gentoo.org</email>
 		<name>Gentoo Astronomy Project</name>
 	</maintainer>

diff --git a/sci-astronomy/chealpix/metadata.xml b/sci-astronomy/chealpix/metadata.xml
index 02c885e..49927d3 100644
--- a/sci-astronomy/chealpix/metadata.xml
+++ b/sci-astronomy/chealpix/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/eazy/metadata.xml b/sci-astronomy/eazy/metadata.xml
index c39080d..277bb09 100644
--- a/sci-astronomy/eazy/metadata.xml
+++ b/sci-astronomy/eazy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/eye/metadata.xml b/sci-astronomy/eye/metadata.xml
index 0d28ccd..733ea27 100644
--- a/sci-astronomy/eye/metadata.xml
+++ b/sci-astronomy/eye/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/galfit-bin/metadata.xml b/sci-astronomy/galfit-bin/metadata.xml
index b17f3db..d66d625 100644
--- a/sci-astronomy/galfit-bin/metadata.xml
+++ b/sci-astronomy/galfit-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/healpix_cxx/metadata.xml b/sci-astronomy/healpix_cxx/metadata.xml
index 91525de..97134d3 100644
--- a/sci-astronomy/healpix_cxx/metadata.xml
+++ b/sci-astronomy/healpix_cxx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/healpix_idl/metadata.xml b/sci-astronomy/healpix_idl/metadata.xml
index ce2dc19..09fbd92 100644
--- a/sci-astronomy/healpix_idl/metadata.xml
+++ b/sci-astronomy/healpix_idl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/lephare/metadata.xml b/sci-astronomy/lephare/metadata.xml
index 18be456..ccde139 100644
--- a/sci-astronomy/lephare/metadata.xml
+++ b/sci-astronomy/lephare/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/libthesky/metadata.xml b/sci-astronomy/libthesky/metadata.xml
index e008ffd..03ad4b5 100644
--- a/sci-astronomy/libthesky/metadata.xml
+++ b/sci-astronomy/libthesky/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>AstroFloyd@gmail.com</email>
     <name>AstroFloyd</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/missfits/metadata.xml b/sci-astronomy/missfits/metadata.xml
index ff70d99..3a1cc24 100644
--- a/sci-astronomy/missfits/metadata.xml
+++ b/sci-astronomy/missfits/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/montage/metadata.xml b/sci-astronomy/montage/metadata.xml
index 5a093b9..5fda381 100644
--- a/sci-astronomy/montage/metadata.xml
+++ b/sci-astronomy/montage/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/mosstack/metadata.xml b/sci-astronomy/mosstack/metadata.xml
index d239cc4..c8bd774 100644
--- a/sci-astronomy/mosstack/metadata.xml
+++ b/sci-astronomy/mosstack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mikko.laine@gmail.com</email>
     <name>Mikko Laine</name>
   </maintainer>

diff --git a/sci-astronomy/psfex/metadata.xml b/sci-astronomy/psfex/metadata.xml
index 242f1f8..45b00a7 100644
--- a/sci-astronomy/psfex/metadata.xml
+++ b/sci-astronomy/psfex/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-astronomy@gentoo.org</email>
   <name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/scamp/metadata.xml b/sci-astronomy/scamp/metadata.xml
index 8a614cf..d337960 100644
--- a/sci-astronomy/scamp/metadata.xml
+++ b/sci-astronomy/scamp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-astronomy@gentoo.org</email>
   <name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/sextractor/metadata.xml b/sci-astronomy/sextractor/metadata.xml
index b55d98f..87b74a0 100644
--- a/sci-astronomy/sextractor/metadata.xml
+++ b/sci-astronomy/sextractor/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 <email>sci-astronomy@gentoo.org</email>
 <name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/skymaker/metadata.xml b/sci-astronomy/skymaker/metadata.xml
index c7f5f7e..a5fb716 100644
--- a/sci-astronomy/skymaker/metadata.xml
+++ b/sci-astronomy/skymaker/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/starlink-bin/metadata.xml b/sci-astronomy/starlink-bin/metadata.xml
index 8668f56..1d4be90 100644
--- a/sci-astronomy/starlink-bin/metadata.xml
+++ b/sci-astronomy/starlink-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/stiff/metadata.xml b/sci-astronomy/stiff/metadata.xml
index 7d015fb..27ad436 100644
--- a/sci-astronomy/stiff/metadata.xml
+++ b/sci-astronomy/stiff/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/stilts/metadata.xml b/sci-astronomy/stilts/metadata.xml
index 544d535..9a91a45 100644
--- a/sci-astronomy/stilts/metadata.xml
+++ b/sci-astronomy/stilts/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/stuff/metadata.xml b/sci-astronomy/stuff/metadata.xml
index 7eeae22..c3150e8 100644
--- a/sci-astronomy/stuff/metadata.xml
+++ b/sci-astronomy/stuff/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/swarp/metadata.xml b/sci-astronomy/swarp/metadata.xml
index 1394342..988b2fe 100644
--- a/sci-astronomy/swarp/metadata.xml
+++ b/sci-astronomy/swarp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/topcat/metadata.xml b/sci-astronomy/topcat/metadata.xml
index 8c1ddd3..70a38f5 100644
--- a/sci-astronomy/topcat/metadata.xml
+++ b/sci-astronomy/topcat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-astronomy@gentoo.org</email>
 	<name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/weightwatcher/metadata.xml b/sci-astronomy/weightwatcher/metadata.xml
index 4964d83..86c4c7d 100644
--- a/sci-astronomy/weightwatcher/metadata.xml
+++ b/sci-astronomy/weightwatcher/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-astronomy@gentoo.org</email>
   <name>Gentoo Astronomy Project</name>
 </maintainer>

diff --git a/sci-astronomy/zebra/metadata.xml b/sci-astronomy/zebra/metadata.xml
index 3fec396..76eebf2 100644
--- a/sci-astronomy/zebra/metadata.xml
+++ b/sci-astronomy/zebra/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-astronomy/zpeg/metadata.xml b/sci-astronomy/zpeg/metadata.xml
index aa278c2..921c2c0 100644
--- a/sci-astronomy/zpeg/metadata.xml
+++ b/sci-astronomy/zpeg/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-astronomy@gentoo.org</email>
 		<name>Gentoo Astronomy Project</name>
 	</maintainer>

diff --git a/sci-biology/AlignGraph/metadata.xml b/sci-biology/AlignGraph/metadata.xml
index 5157a34..f060cdc 100644
--- a/sci-biology/AlignGraph/metadata.xml
+++ b/sci-biology/AlignGraph/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Atlas-Link/metadata.xml b/sci-biology/Atlas-Link/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Atlas-Link/metadata.xml
+++ b/sci-biology/Atlas-Link/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Atlas/metadata.xml b/sci-biology/Atlas/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Atlas/metadata.xml
+++ b/sci-biology/Atlas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Atlas2/metadata.xml b/sci-biology/Atlas2/metadata.xml
index 756a1a6..3ff6cee 100644
--- a/sci-biology/Atlas2/metadata.xml
+++ b/sci-biology/Atlas2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Atlas_GapFill/metadata.xml b/sci-biology/Atlas_GapFill/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Atlas_GapFill/metadata.xml
+++ b/sci-biology/Atlas_GapFill/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/BBmap/metadata.xml b/sci-biology/BBmap/metadata.xml
index 226e440..40ba306 100644
--- a/sci-biology/BBmap/metadata.xml
+++ b/sci-biology/BBmap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/BG7/metadata.xml b/sci-biology/BG7/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/BG7/metadata.xml
+++ b/sci-biology/BG7/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/BRAKER/metadata.xml b/sci-biology/BRAKER/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/BRAKER/metadata.xml
+++ b/sci-biology/BRAKER/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/BRANCH/metadata.xml b/sci-biology/BRANCH/metadata.xml
index ea63da3..e6ac3bb 100644
--- a/sci-biology/BRANCH/metadata.xml
+++ b/sci-biology/BRANCH/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/BamView/metadata.xml b/sci-biology/BamView/metadata.xml
index 6cbc71f..e251297 100644
--- a/sci-biology/BamView/metadata.xml
+++ b/sci-biology/BamView/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/BlastToSam/metadata.xml b/sci-biology/BlastToSam/metadata.xml
index db5cd4d..9885a3a 100644
--- a/sci-biology/BlastToSam/metadata.xml
+++ b/sci-biology/BlastToSam/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/CONTIGuator/metadata.xml b/sci-biology/CONTIGuator/metadata.xml
index 8f46479..4bdff74 100644
--- a/sci-biology/CONTIGuator/metadata.xml
+++ b/sci-biology/CONTIGuator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/DisEMBL/metadata.xml b/sci-biology/DisEMBL/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/DisEMBL/metadata.xml
+++ b/sci-biology/DisEMBL/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/EBARDenovo/metadata.xml b/sci-biology/EBARDenovo/metadata.xml
index 9004da0..3aa5ff5 100644
--- a/sci-biology/EBARDenovo/metadata.xml
+++ b/sci-biology/EBARDenovo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ESTate/metadata.xml b/sci-biology/ESTate/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ESTate/metadata.xml
+++ b/sci-biology/ESTate/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/FLASH/metadata.xml b/sci-biology/FLASH/metadata.xml
index a72b244..bb87910 100644
--- a/sci-biology/FLASH/metadata.xml
+++ b/sci-biology/FLASH/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/GAL/metadata.xml b/sci-biology/GAL/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/GAL/metadata.xml
+++ b/sci-biology/GAL/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Gambit/metadata.xml b/sci-biology/Gambit/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Gambit/metadata.xml
+++ b/sci-biology/Gambit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/HTSeq/metadata.xml b/sci-biology/HTSeq/metadata.xml
index 2553594..a51edc8 100644
--- a/sci-biology/HTSeq/metadata.xml
+++ b/sci-biology/HTSeq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ICC/metadata.xml b/sci-biology/ICC/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ICC/metadata.xml
+++ b/sci-biology/ICC/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/IMAGE/metadata.xml b/sci-biology/IMAGE/metadata.xml
index 9a6daad..6d3e53e 100644
--- a/sci-biology/IMAGE/metadata.xml
+++ b/sci-biology/IMAGE/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/InterMine/metadata.xml b/sci-biology/InterMine/metadata.xml
index ca6203d..5ac633a 100644
--- a/sci-biology/InterMine/metadata.xml
+++ b/sci-biology/InterMine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Jannovar-bin/metadata.xml b/sci-biology/Jannovar-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Jannovar-bin/metadata.xml
+++ b/sci-biology/Jannovar-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/KaKs_Calculator/metadata.xml b/sci-biology/KaKs_Calculator/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/KaKs_Calculator/metadata.xml
+++ b/sci-biology/KaKs_Calculator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/MaSuRCA/metadata.xml b/sci-biology/MaSuRCA/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/MaSuRCA/metadata.xml
+++ b/sci-biology/MaSuRCA/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/MagicViewer/metadata.xml b/sci-biology/MagicViewer/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/MagicViewer/metadata.xml
+++ b/sci-biology/MagicViewer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/MeV/metadata.xml b/sci-biology/MeV/metadata.xml
index 6fa7602..ef6150a 100644
--- a/sci-biology/MeV/metadata.xml
+++ b/sci-biology/MeV/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/MochiView/metadata.xml b/sci-biology/MochiView/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/MochiView/metadata.xml
+++ b/sci-biology/MochiView/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/MuSeqBox/metadata.xml b/sci-biology/MuSeqBox/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/MuSeqBox/metadata.xml
+++ b/sci-biology/MuSeqBox/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/NGSTools/metadata.xml b/sci-biology/NGSTools/metadata.xml
index 29e0d8d..7361e76 100644
--- a/sci-biology/NGSTools/metadata.xml
+++ b/sci-biology/NGSTools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/OBO-Edit/metadata.xml b/sci-biology/OBO-Edit/metadata.xml
index 3aa01cc..acbbc35 100644
--- a/sci-biology/OBO-Edit/metadata.xml
+++ b/sci-biology/OBO-Edit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/ONTO-PERL/metadata.xml b/sci-biology/ONTO-PERL/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/ONTO-PERL/metadata.xml
+++ b/sci-biology/ONTO-PERL/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ORFcor/metadata.xml b/sci-biology/ORFcor/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ORFcor/metadata.xml
+++ b/sci-biology/ORFcor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/RADtools/metadata.xml b/sci-biology/RADtools/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/RADtools/metadata.xml
+++ b/sci-biology/RADtools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/RSeQC/metadata.xml b/sci-biology/RSeQC/metadata.xml
index dbb6311..0452b28 100644
--- a/sci-biology/RSeQC/metadata.xml
+++ b/sci-biology/RSeQC/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Ray/metadata.xml b/sci-biology/Ray/metadata.xml
index 882d4c4..982286f 100644
--- a/sci-biology/Ray/metadata.xml
+++ b/sci-biology/Ray/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/Rcorrector/metadata.xml b/sci-biology/Rcorrector/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/Rcorrector/metadata.xml
+++ b/sci-biology/Rcorrector/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/SEECER/metadata.xml b/sci-biology/SEECER/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/SEECER/metadata.xml
+++ b/sci-biology/SEECER/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/SSAKE/metadata.xml b/sci-biology/SSAKE/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/SSAKE/metadata.xml
+++ b/sci-biology/SSAKE/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/STAR/metadata.xml b/sci-biology/STAR/metadata.xml
index 717eb68..68af338 100644
--- a/sci-biology/STAR/metadata.xml
+++ b/sci-biology/STAR/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/SolexaQA/metadata.xml b/sci-biology/SolexaQA/metadata.xml
index a3170c8..c9f605e 100644
--- a/sci-biology/SolexaQA/metadata.xml
+++ b/sci-biology/SolexaQA/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/StarORF/metadata.xml b/sci-biology/StarORF/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/StarORF/metadata.xml
+++ b/sci-biology/StarORF/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/TransDecoder/metadata.xml b/sci-biology/TransDecoder/metadata.xml
index 828266a..42a56a2 100644
--- a/sci-biology/TransDecoder/metadata.xml
+++ b/sci-biology/TransDecoder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/Trinotate/metadata.xml b/sci-biology/Trinotate/metadata.xml
index 63cd41a..f409887 100644
--- a/sci-biology/Trinotate/metadata.xml
+++ b/sci-biology/Trinotate/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/VarScan/metadata.xml b/sci-biology/VarScan/metadata.xml
index 3500f7e..fae01f1 100644
--- a/sci-biology/VarScan/metadata.xml
+++ b/sci-biology/VarScan/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/VelvetOptimiser/metadata.xml b/sci-biology/VelvetOptimiser/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/VelvetOptimiser/metadata.xml
+++ b/sci-biology/VelvetOptimiser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/YASRA/metadata.xml b/sci-biology/YASRA/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/YASRA/metadata.xml
+++ b/sci-biology/YASRA/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/abacas/metadata.xml b/sci-biology/abacas/metadata.xml
index 511b05d..c458ee9 100644
--- a/sci-biology/abacas/metadata.xml
+++ b/sci-biology/abacas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/abyss/metadata.xml b/sci-biology/abyss/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/abyss/metadata.xml
+++ b/sci-biology/abyss/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/aghermann/metadata.xml b/sci-biology/aghermann/metadata.xml
index 8ee3060..b622827 100644
--- a/sci-biology/aghermann/metadata.xml
+++ b/sci-biology/aghermann/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>johnhommer@gmail.com</email>
     <name>Andrei Zavada</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/align_to_scf/metadata.xml b/sci-biology/align_to_scf/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/align_to_scf/metadata.xml
+++ b/sci-biology/align_to_scf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/amos/metadata.xml b/sci-biology/amos/metadata.xml
index 63c6e36..d8574e5 100644
--- a/sci-biology/amos/metadata.xml
+++ b/sci-biology/amos/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ampliconnoise/metadata.xml b/sci-biology/ampliconnoise/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ampliconnoise/metadata.xml
+++ b/sci-biology/ampliconnoise/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/angsd/metadata.xml b/sci-biology/angsd/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/angsd/metadata.xml
+++ b/sci-biology/angsd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ants/metadata.xml b/sci-biology/ants/metadata.xml
index 0fa803c..71c2ce9 100644
--- a/sci-biology/ants/metadata.xml
+++ b/sci-biology/ants/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/apollo/metadata.xml b/sci-biology/apollo/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/apollo/metadata.xml
+++ b/sci-biology/apollo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/argo-bin/metadata.xml b/sci-biology/argo-bin/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/argo-bin/metadata.xml
+++ b/sci-biology/argo-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/argo/metadata.xml b/sci-biology/argo/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/argo/metadata.xml
+++ b/sci-biology/argo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/artemis-bin/metadata.xml b/sci-biology/artemis-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/artemis-bin/metadata.xml
+++ b/sci-biology/artemis-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/artemis/metadata.xml b/sci-biology/artemis/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/artemis/metadata.xml
+++ b/sci-biology/artemis/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/atsas/metadata.xml b/sci-biology/atsas/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/atsas/metadata.xml
+++ b/sci-biology/atsas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/augustus/metadata.xml b/sci-biology/augustus/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/augustus/metadata.xml
+++ b/sci-biology/augustus/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/autoeditor/metadata.xml b/sci-biology/autoeditor/metadata.xml
index 7ae506f..af250f1 100644
--- a/sci-biology/autoeditor/metadata.xml
+++ b/sci-biology/autoeditor/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/bambino/metadata.xml b/sci-biology/bambino/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/bambino/metadata.xml
+++ b/sci-biology/bambino/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/bambus/metadata.xml b/sci-biology/bambus/metadata.xml
index aa2f73a..4736dbf 100644
--- a/sci-biology/bambus/metadata.xml
+++ b/sci-biology/bambus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/bamtools/metadata.xml b/sci-biology/bamtools/metadata.xml
index 872dce8..fb098c7 100644
--- a/sci-biology/bamtools/metadata.xml
+++ b/sci-biology/bamtools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/barnacle/metadata.xml b/sci-biology/barnacle/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/barnacle/metadata.xml
+++ b/sci-biology/barnacle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/barrnap/metadata.xml b/sci-biology/barrnap/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/barrnap/metadata.xml
+++ b/sci-biology/barrnap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/bcftools/metadata.xml b/sci-biology/bcftools/metadata.xml
index bb40c9a..74c17a1 100644
--- a/sci-biology/bcftools/metadata.xml
+++ b/sci-biology/bcftools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/beagle/metadata.xml b/sci-biology/beagle/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/beagle/metadata.xml
+++ b/sci-biology/beagle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/beaglecall/metadata.xml b/sci-biology/beaglecall/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/beaglecall/metadata.xml
+++ b/sci-biology/beaglecall/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/bedtools/metadata.xml b/sci-biology/bedtools/metadata.xml
index 7cdbc1c..39869a9 100644
--- a/sci-biology/bedtools/metadata.xml
+++ b/sci-biology/bedtools/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>

diff --git a/sci-biology/biobambam/metadata.xml b/sci-biology/biobambam/metadata.xml
index d17c1d3..a3e55a4 100644
--- a/sci-biology/biobambam/metadata.xml
+++ b/sci-biology/biobambam/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/biopieces/metadata.xml b/sci-biology/biopieces/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/biopieces/metadata.xml
+++ b/sci-biology/biopieces/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/bismark/metadata.xml b/sci-biology/bismark/metadata.xml
index 02b9183..00744d6 100644
--- a/sci-biology/bismark/metadata.xml
+++ b/sci-biology/bismark/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>yanlinlin82@gmail.com</email>
     <name>Linlin Yan</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/blasr/metadata.xml b/sci-biology/blasr/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/blasr/metadata.xml
+++ b/sci-biology/blasr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/blue/metadata.xml b/sci-biology/blue/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/blue/metadata.xml
+++ b/sci-biology/blue/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/brat/metadata.xml b/sci-biology/brat/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/brat/metadata.xml
+++ b/sci-biology/brat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/breakdancer/metadata.xml b/sci-biology/breakdancer/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/breakdancer/metadata.xml
+++ b/sci-biology/breakdancer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/bru2nii/metadata.xml b/sci-biology/bru2nii/metadata.xml
index 4becce9..0cec337 100644
--- a/sci-biology/bru2nii/metadata.xml
+++ b/sci-biology/bru2nii/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/bx-python/metadata.xml b/sci-biology/bx-python/metadata.xml
index eb7de83..0a7390b 100644
--- a/sci-biology/bx-python/metadata.xml
+++ b/sci-biology/bx-python/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/caftools/metadata.xml b/sci-biology/caftools/metadata.xml
index 505ce3a..81b61ad 100644
--- a/sci-biology/caftools/metadata.xml
+++ b/sci-biology/caftools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cap3-bin/metadata.xml b/sci-biology/cap3-bin/metadata.xml
index c5942c6..67c64b4 100644
--- a/sci-biology/cap3-bin/metadata.xml
+++ b/sci-biology/cap3-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/cast-bin/metadata.xml b/sci-biology/cast-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/cast-bin/metadata.xml
+++ b/sci-biology/cast-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cd-hit-auxtools/metadata.xml b/sci-biology/cd-hit-auxtools/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/cd-hit-auxtools/metadata.xml
+++ b/sci-biology/cd-hit-auxtools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cd-hit/metadata.xml b/sci-biology/cd-hit/metadata.xml
index 2fad5f2..2880d66 100644
--- a/sci-biology/cd-hit/metadata.xml
+++ b/sci-biology/cd-hit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/cdbfasta/metadata.xml b/sci-biology/cdbfasta/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/cdbfasta/metadata.xml
+++ b/sci-biology/cdbfasta/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/cegma/metadata.xml b/sci-biology/cegma/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/cegma/metadata.xml
+++ b/sci-biology/cegma/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cgview-bin/metadata.xml b/sci-biology/cgview-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/cgview-bin/metadata.xml
+++ b/sci-biology/cgview-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/clover/metadata.xml b/sci-biology/clover/metadata.xml
index 1ceef22..cc46736 100644
--- a/sci-biology/clover/metadata.xml
+++ b/sci-biology/clover/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>maintainer-wanted@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cluster/metadata.xml b/sci-biology/cluster/metadata.xml
index 80e3211..2c86135 100644
--- a/sci-biology/cluster/metadata.xml
+++ b/sci-biology/cluster/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>je_fro@gentoo.org</email>
     <name>Jeff Gardner</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/clview/metadata.xml b/sci-biology/clview/metadata.xml
index 1019e88..7adf609 100644
--- a/sci-biology/clview/metadata.xml
+++ b/sci-biology/clview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/cnrun/metadata.xml b/sci-biology/cnrun/metadata.xml
index 5b3658e..1b2b557 100644
--- a/sci-biology/cnrun/metadata.xml
+++ b/sci-biology/cnrun/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>johnhommer@gmail.com</email>
     <name>Andrei Zavada</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/codonw/metadata.xml b/sci-biology/codonw/metadata.xml
index 0d1e2bd..6242070 100644
--- a/sci-biology/codonw/metadata.xml
+++ b/sci-biology/codonw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/conform-gt/metadata.xml b/sci-biology/conform-gt/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/conform-gt/metadata.xml
+++ b/sci-biology/conform-gt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/conifer/metadata.xml b/sci-biology/conifer/metadata.xml
index 7885c92..fe41739 100644
--- a/sci-biology/conifer/metadata.xml
+++ b/sci-biology/conifer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/consed/metadata.xml b/sci-biology/consed/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/consed/metadata.xml
+++ b/sci-biology/consed/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/consed2gap/metadata.xml b/sci-biology/consed2gap/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/consed2gap/metadata.xml
+++ b/sci-biology/consed2gap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/coral/metadata.xml b/sci-biology/coral/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/coral/metadata.xml
+++ b/sci-biology/coral/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cortex_var/metadata.xml b/sci-biology/cortex_var/metadata.xml
index 02e35ae..aeef1bb 100644
--- a/sci-biology/cortex_var/metadata.xml
+++ b/sci-biology/cortex_var/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/cutadapt/metadata.xml b/sci-biology/cutadapt/metadata.xml
index 34b2157..dde730c 100644
--- a/sci-biology/cutadapt/metadata.xml
+++ b/sci-biology/cutadapt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/dawg/metadata.xml b/sci-biology/dawg/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/dawg/metadata.xml
+++ b/sci-biology/dawg/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/dcmstack/metadata.xml b/sci-biology/dcmstack/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/dcmstack/metadata.xml
+++ b/sci-biology/dcmstack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/discrover/metadata.xml b/sci-biology/discrover/metadata.xml
index 85d16cf..bab24b6 100644
--- a/sci-biology/discrover/metadata.xml
+++ b/sci-biology/discrover/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jonas@maaskola.de</email>
     <name>Jonas Maaskola</name>
   </maintainer>

diff --git a/sci-biology/dna2pep/metadata.xml b/sci-biology/dna2pep/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/dna2pep/metadata.xml
+++ b/sci-biology/dna2pep/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ePCR/metadata.xml b/sci-biology/ePCR/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ePCR/metadata.xml
+++ b/sci-biology/ePCR/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/edena/metadata.xml b/sci-biology/edena/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/edena/metadata.xml
+++ b/sci-biology/edena/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/epga/metadata.xml b/sci-biology/epga/metadata.xml
index 4075e3b..991e17b 100644
--- a/sci-biology/epga/metadata.xml
+++ b/sci-biology/epga/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/erpin/metadata.xml b/sci-biology/erpin/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/erpin/metadata.xml
+++ b/sci-biology/erpin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/est2assembly/metadata.xml b/sci-biology/est2assembly/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/est2assembly/metadata.xml
+++ b/sci-biology/est2assembly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/estscan/metadata.xml b/sci-biology/estscan/metadata.xml
index f0cf0eb..462149b 100644
--- a/sci-biology/estscan/metadata.xml
+++ b/sci-biology/estscan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/eval/metadata.xml b/sci-biology/eval/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/eval/metadata.xml
+++ b/sci-biology/eval/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/exomiser-bin/metadata.xml b/sci-biology/exomiser-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/exomiser-bin/metadata.xml
+++ b/sci-biology/exomiser-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/exonerate-gff3/metadata.xml b/sci-biology/exonerate-gff3/metadata.xml
index 992b853..10ca6b3 100644
--- a/sci-biology/exonerate-gff3/metadata.xml
+++ b/sci-biology/exonerate-gff3/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/fastdnaml/metadata.xml b/sci-biology/fastdnaml/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/fastdnaml/metadata.xml
+++ b/sci-biology/fastdnaml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/fastqc/metadata.xml b/sci-biology/fastqc/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/fastqc/metadata.xml
+++ b/sci-biology/fastqc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/fastx_toolkit/metadata.xml b/sci-biology/fastx_toolkit/metadata.xml
index d1142ad..8203c39 100644
--- a/sci-biology/fastx_toolkit/metadata.xml
+++ b/sci-biology/fastx_toolkit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/ffindex/metadata.xml b/sci-biology/ffindex/metadata.xml
index c6d5df3..ccb4049 100644
--- a/sci-biology/ffindex/metadata.xml
+++ b/sci-biology/ffindex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/flexbar/metadata.xml b/sci-biology/flexbar/metadata.xml
index 19c0169..ce8e589 100644
--- a/sci-biology/flexbar/metadata.xml
+++ b/sci-biology/flexbar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/freebayes/metadata.xml b/sci-biology/freebayes/metadata.xml
index dc73f47..a82cda5 100644
--- a/sci-biology/freebayes/metadata.xml
+++ b/sci-biology/freebayes/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/fsa/metadata.xml b/sci-biology/fsa/metadata.xml
index 729f82e..ec2601d 100644
--- a/sci-biology/fsa/metadata.xml
+++ b/sci-biology/fsa/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/fsl/metadata.xml b/sci-biology/fsl/metadata.xml
index 2d7973d..d378868 100644
--- a/sci-biology/fsl/metadata.xml
+++ b/sci-biology/fsl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/full_lengther_next/metadata.xml b/sci-biology/full_lengther_next/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/full_lengther_next/metadata.xml
+++ b/sci-biology/full_lengther_next/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/gap2caf/metadata.xml b/sci-biology/gap2caf/metadata.xml
index 7885c92..fe41739 100644
--- a/sci-biology/gap2caf/metadata.xml
+++ b/sci-biology/gap2caf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/gbench/metadata.xml b/sci-biology/gbench/metadata.xml
index 71d4974..8417d15 100644
--- a/sci-biology/gbench/metadata.xml
+++ b/sci-biology/gbench/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/gbrowse/metadata.xml b/sci-biology/gbrowse/metadata.xml
index a5d27ae..6e0ee19 100644
--- a/sci-biology/gbrowse/metadata.xml
+++ b/sci-biology/gbrowse/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
     <description>GBrowse is a generic genome browser.</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/geneid/metadata.xml b/sci-biology/geneid/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/geneid/metadata.xml
+++ b/sci-biology/geneid/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/genepop/metadata.xml b/sci-biology/genepop/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/genepop/metadata.xml
+++ b/sci-biology/genepop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/generecon/metadata.xml b/sci-biology/generecon/metadata.xml
index 943a31d..ba3b765 100644
--- a/sci-biology/generecon/metadata.xml
+++ b/sci-biology/generecon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>lucas.chiesa@gmail.com</email>
     <name>Lucas Chiesa</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/genometools/metadata.xml b/sci-biology/genometools/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/genometools/metadata.xml
+++ b/sci-biology/genometools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/genomeview-bin/metadata.xml b/sci-biology/genomeview-bin/metadata.xml
index 48012d3..b6476ca 100644
--- a/sci-biology/genomeview-bin/metadata.xml
+++ b/sci-biology/genomeview-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/genseed/metadata.xml b/sci-biology/genseed/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/genseed/metadata.xml
+++ b/sci-biology/genseed/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/gfftools/metadata.xml b/sci-biology/gfftools/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/gfftools/metadata.xml
+++ b/sci-biology/gfftools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/gffutils/metadata.xml b/sci-biology/gffutils/metadata.xml
index 2197a0c..70c9800 100644
--- a/sci-biology/gffutils/metadata.xml
+++ b/sci-biology/gffutils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/glean/metadata.xml b/sci-biology/glean/metadata.xml
index 2844c0b..be2ebce 100644
--- a/sci-biology/glean/metadata.xml
+++ b/sci-biology/glean/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/grappa/metadata.xml b/sci-biology/grappa/metadata.xml
index 057825c..525e88d 100644
--- a/sci-biology/grappa/metadata.xml
+++ b/sci-biology/grappa/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="unknown">
 		<email>weaver@gentoo.org</email>
 		<name>Andrey Kislyuk</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/hexamer/metadata.xml b/sci-biology/hexamer/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/hexamer/metadata.xml
+++ b/sci-biology/hexamer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/hmmer/metadata.xml b/sci-biology/hmmer/metadata.xml
index 35f1aab..a6a17ef 100644
--- a/sci-biology/hmmer/metadata.xml
+++ b/sci-biology/hmmer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/hydra-sv/metadata.xml b/sci-biology/hydra-sv/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/hydra-sv/metadata.xml
+++ b/sci-biology/hydra-sv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/igv/metadata.xml b/sci-biology/igv/metadata.xml
index 84a79d7..b95b6d9 100644
--- a/sci-biology/igv/metadata.xml
+++ b/sci-biology/igv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/inGAP-bin/metadata.xml b/sci-biology/inGAP-bin/metadata.xml
index 8d8c08e..4e706cb 100644
--- a/sci-biology/inGAP-bin/metadata.xml
+++ b/sci-biology/inGAP-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/jellyfish/metadata.xml b/sci-biology/jellyfish/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/jellyfish/metadata.xml
+++ b/sci-biology/jellyfish/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/jigsaw/metadata.xml b/sci-biology/jigsaw/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/jigsaw/metadata.xml
+++ b/sci-biology/jigsaw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/jtreeview/metadata.xml b/sci-biology/jtreeview/metadata.xml
index 02165d1..3b98c8e 100644
--- a/sci-biology/jtreeview/metadata.xml
+++ b/sci-biology/jtreeview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/kallisto/metadata.xml b/sci-biology/kallisto/metadata.xml
index d21036f..a8b4491 100644
--- a/sci-biology/kallisto/metadata.xml
+++ b/sci-biology/kallisto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/khmer/metadata.xml b/sci-biology/khmer/metadata.xml
index 4ce7485..54fa7d5 100644
--- a/sci-biology/khmer/metadata.xml
+++ b/sci-biology/khmer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/kmergenie/metadata.xml b/sci-biology/kmergenie/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/kmergenie/metadata.xml
+++ b/sci-biology/kmergenie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/lastz/metadata.xml b/sci-biology/lastz/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/lastz/metadata.xml
+++ b/sci-biology/lastz/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/libgtextutils/metadata.xml b/sci-biology/libgtextutils/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/libgtextutils/metadata.xml
+++ b/sci-biology/libgtextutils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/lighter/metadata.xml b/sci-biology/lighter/metadata.xml
index 88d01a7..6299d4c 100644
--- a/sci-biology/lighter/metadata.xml
+++ b/sci-biology/lighter/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/lucy/metadata.xml b/sci-biology/lucy/metadata.xml
index ff2fea0..4aca9ee 100644
--- a/sci-biology/lucy/metadata.xml
+++ b/sci-biology/lucy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/mRNAmarkup/metadata.xml b/sci-biology/mRNAmarkup/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/mRNAmarkup/metadata.xml
+++ b/sci-biology/mRNAmarkup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/maker/metadata.xml b/sci-biology/maker/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/maker/metadata.xml
+++ b/sci-biology/maker/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/manatee-igs/metadata.xml b/sci-biology/manatee-igs/metadata.xml
index bec11b0..8c0eb33 100644
--- a/sci-biology/manatee-igs/metadata.xml
+++ b/sci-biology/manatee-igs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/manatee-jcvi/metadata.xml b/sci-biology/manatee-jcvi/metadata.xml
index bec11b0..8c0eb33 100644
--- a/sci-biology/manatee-jcvi/metadata.xml
+++ b/sci-biology/manatee-jcvi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mavid/metadata.xml b/sci-biology/mavid/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/mavid/metadata.xml
+++ b/sci-biology/mavid/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/merlin/metadata.xml b/sci-biology/merlin/metadata.xml
index 057825c..525e88d 100644
--- a/sci-biology/merlin/metadata.xml
+++ b/sci-biology/merlin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="unknown">
 		<email>weaver@gentoo.org</email>
 		<name>Andrey Kislyuk</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/metaseq/metadata.xml b/sci-biology/metaseq/metadata.xml
index e662f7a..146972a 100644
--- a/sci-biology/metaseq/metadata.xml
+++ b/sci-biology/metaseq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mgblast/metadata.xml b/sci-biology/mgblast/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/mgblast/metadata.xml
+++ b/sci-biology/mgblast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/minced/metadata.xml b/sci-biology/minced/metadata.xml
index 7057282..58a5e29 100644
--- a/sci-biology/minced/metadata.xml
+++ b/sci-biology/minced/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mip-scaffolder/metadata.xml b/sci-biology/mip-scaffolder/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/mip-scaffolder/metadata.xml
+++ b/sci-biology/mip-scaffolder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mira/metadata.xml b/sci-biology/mira/metadata.xml
index c19aae1..0704cef 100644
--- a/sci-biology/mira/metadata.xml
+++ b/sci-biology/mira/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/miranda/metadata.xml b/sci-biology/miranda/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/miranda/metadata.xml
+++ b/sci-biology/miranda/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mne-python/metadata.xml b/sci-biology/mne-python/metadata.xml
index 7ee4203..f1ce8ef 100644
--- a/sci-biology/mne-python/metadata.xml
+++ b/sci-biology/mne-python/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/mosaik/metadata.xml b/sci-biology/mosaik/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/mosaik/metadata.xml
+++ b/sci-biology/mosaik/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mothur/metadata.xml b/sci-biology/mothur/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/mothur/metadata.xml
+++ b/sci-biology/mothur/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mreps/metadata.xml b/sci-biology/mreps/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/mreps/metadata.xml
+++ b/sci-biology/mreps/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mrfast/metadata.xml b/sci-biology/mrfast/metadata.xml
index 83997aa..eb9e92d 100644
--- a/sci-biology/mrfast/metadata.xml
+++ b/sci-biology/mrfast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/mricron/metadata.xml b/sci-biology/mricron/metadata.xml
index e8c1136..3e689de 100644
--- a/sci-biology/mricron/metadata.xml
+++ b/sci-biology/mricron/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/mrsfast/metadata.xml b/sci-biology/mrsfast/metadata.xml
index b5b6352..aa16b13 100644
--- a/sci-biology/mrsfast/metadata.xml
+++ b/sci-biology/mrsfast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ncbi-blast+/metadata.xml b/sci-biology/ncbi-blast+/metadata.xml
index 4deaf59..f9db152 100644
--- a/sci-biology/ncbi-blast+/metadata.xml
+++ b/sci-biology/ncbi-blast+/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ncbi-tools++/metadata.xml b/sci-biology/ncbi-tools++/metadata.xml
index 72b26cf..157c35a 100644
--- a/sci-biology/ncbi-tools++/metadata.xml
+++ b/sci-biology/ncbi-tools++/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/nesoni/metadata.xml b/sci-biology/nesoni/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/nesoni/metadata.xml
+++ b/sci-biology/nesoni/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ngs_backbone/metadata.xml b/sci-biology/ngs_backbone/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/ngs_backbone/metadata.xml
+++ b/sci-biology/ngs_backbone/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/ngsview/metadata.xml b/sci-biology/ngsview/metadata.xml
index f703fc4..de315fd 100644
--- a/sci-biology/ngsview/metadata.xml
+++ b/sci-biology/ngsview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/nilearn/metadata.xml b/sci-biology/nilearn/metadata.xml
index 5607149..758b7e0 100644
--- a/sci-biology/nilearn/metadata.xml
+++ b/sci-biology/nilearn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/nistats/metadata.xml b/sci-biology/nistats/metadata.xml
index 7eceebe..0701af4 100644
--- a/sci-biology/nistats/metadata.xml
+++ b/sci-biology/nistats/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/nrcl/metadata.xml b/sci-biology/nrcl/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/nrcl/metadata.xml
+++ b/sci-biology/nrcl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/nwalign/metadata.xml b/sci-biology/nwalign/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/nwalign/metadata.xml
+++ b/sci-biology/nwalign/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pairagon/metadata.xml b/sci-biology/pairagon/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/pairagon/metadata.xml
+++ b/sci-biology/pairagon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/parafly/metadata.xml b/sci-biology/parafly/metadata.xml
index 6dbd521..6f6587b 100644
--- a/sci-biology/parafly/metadata.xml
+++ b/sci-biology/parafly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pb-honey/metadata.xml b/sci-biology/pb-honey/metadata.xml
index 63609cc..7b4669b 100644
--- a/sci-biology/pb-honey/metadata.xml
+++ b/sci-biology/pb-honey/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pb-jelly/metadata.xml b/sci-biology/pb-jelly/metadata.xml
index 63609cc..7b4669b 100644
--- a/sci-biology/pb-jelly/metadata.xml
+++ b/sci-biology/pb-jelly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/perlprimer/metadata.xml b/sci-biology/perlprimer/metadata.xml
index c04bbdc..9454a7f 100644
--- a/sci-biology/perlprimer/metadata.xml
+++ b/sci-biology/perlprimer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/phusion/metadata.xml b/sci-biology/phusion/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/phusion/metadata.xml
+++ b/sci-biology/phusion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pileup/metadata.xml b/sci-biology/pileup/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/pileup/metadata.xml
+++ b/sci-biology/pileup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/plinkseq/metadata.xml b/sci-biology/plinkseq/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/plinkseq/metadata.xml
+++ b/sci-biology/plinkseq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/polyphen/metadata.xml b/sci-biology/polyphen/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/polyphen/metadata.xml
+++ b/sci-biology/polyphen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/primerD/metadata.xml b/sci-biology/primerD/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/primerD/metadata.xml
+++ b/sci-biology/primerD/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/proda/metadata.xml b/sci-biology/proda/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/proda/metadata.xml
+++ b/sci-biology/proda/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/prokka/metadata.xml b/sci-biology/prokka/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/prokka/metadata.xml
+++ b/sci-biology/prokka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/prot4EST/metadata.xml b/sci-biology/prot4EST/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/prot4EST/metadata.xml
+++ b/sci-biology/prot4EST/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/psx/metadata.xml b/sci-biology/psx/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/psx/metadata.xml
+++ b/sci-biology/psx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/psychopy/metadata.xml b/sci-biology/psychopy/metadata.xml
index b8d50e5..e34ec74 100644
--- a/sci-biology/psychopy/metadata.xml
+++ b/sci-biology/psychopy/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>TheChymera</name>
   </maintainer>

diff --git a/sci-biology/pvmsx/metadata.xml b/sci-biology/pvmsx/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/pvmsx/metadata.xml
+++ b/sci-biology/pvmsx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pybedtools/metadata.xml b/sci-biology/pybedtools/metadata.xml
index 2fff969..320a73b 100644
--- a/sci-biology/pybedtools/metadata.xml
+++ b/sci-biology/pybedtools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pybrain/metadata.xml b/sci-biology/pybrain/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/pybrain/metadata.xml
+++ b/sci-biology/pybrain/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/pyfaidx/metadata.xml b/sci-biology/pyfaidx/metadata.xml
index 747e9b3..ea3df52 100644
--- a/sci-biology/pyfaidx/metadata.xml
+++ b/sci-biology/pyfaidx/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pysam/metadata.xml b/sci-biology/pysam/metadata.xml
index fba5123..d286c31 100644
--- a/sci-biology/pysam/metadata.xml
+++ b/sci-biology/pysam/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/pysurfer/metadata.xml b/sci-biology/pysurfer/metadata.xml
index 5c0b4c1..20bf771 100644
--- a/sci-biology/pysurfer/metadata.xml
+++ b/sci-biology/pysurfer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/quast/metadata.xml b/sci-biology/quast/metadata.xml
index 235b8f1..fc50a9a 100644
--- a/sci-biology/quast/metadata.xml
+++ b/sci-biology/quast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/quicktree/metadata.xml b/sci-biology/quicktree/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/quicktree/metadata.xml
+++ b/sci-biology/quicktree/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/quorum/metadata.xml b/sci-biology/quorum/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/quorum/metadata.xml
+++ b/sci-biology/quorum/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/repeatmasker-libraries/metadata.xml b/sci-biology/repeatmasker-libraries/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/repeatmasker-libraries/metadata.xml
+++ b/sci-biology/repeatmasker-libraries/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/repeatmasker/metadata.xml b/sci-biology/repeatmasker/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/repeatmasker/metadata.xml
+++ b/sci-biology/repeatmasker/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/reptile/metadata.xml b/sci-biology/reptile/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/reptile/metadata.xml
+++ b/sci-biology/reptile/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/rnaplex/metadata.xml b/sci-biology/rnaplex/metadata.xml
index 057825c..525e88d 100644
--- a/sci-biology/rnaplex/metadata.xml
+++ b/sci-biology/rnaplex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="unknown">
 		<email>weaver@gentoo.org</email>
 		<name>Andrey Kislyuk</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/roche454ace2caf/metadata.xml b/sci-biology/roche454ace2caf/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/roche454ace2caf/metadata.xml
+++ b/sci-biology/roche454ace2caf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/ruffus/metadata.xml b/sci-biology/ruffus/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ruffus/metadata.xml
+++ b/sci-biology/ruffus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/rum/metadata.xml b/sci-biology/rum/metadata.xml
index 5be6266..797ed0b 100644
--- a/sci-biology/rum/metadata.xml
+++ b/sci-biology/rum/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sabre/metadata.xml b/sci-biology/sabre/metadata.xml
index 7f3a8da..6efd5bb 100644
--- a/sci-biology/sabre/metadata.xml
+++ b/sci-biology/sabre/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/salmon/metadata.xml b/sci-biology/salmon/metadata.xml
index a00fe17..1d04676 100644
--- a/sci-biology/salmon/metadata.xml
+++ b/sci-biology/salmon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/samstat/metadata.xml b/sci-biology/samstat/metadata.xml
index a7b98bb..74a00f5 100644
--- a/sci-biology/samstat/metadata.xml
+++ b/sci-biology/samstat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/samtools/metadata.xml b/sci-biology/samtools/metadata.xml
index 0a1dbde..5b953af 100644
--- a/sci-biology/samtools/metadata.xml
+++ b/sci-biology/samtools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scaffold_builder/metadata.xml b/sci-biology/scaffold_builder/metadata.xml
index 495d2f3..0af9161 100644
--- a/sci-biology/scaffold_builder/metadata.xml
+++ b/sci-biology/scaffold_builder/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scan_for_matches/metadata.xml b/sci-biology/scan_for_matches/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/scan_for_matches/metadata.xml
+++ b/sci-biology/scan_for_matches/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scbi_blast/metadata.xml b/sci-biology/scbi_blast/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/scbi_blast/metadata.xml
+++ b/sci-biology/scbi_blast/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scbi_fasta/metadata.xml b/sci-biology/scbi_fasta/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/scbi_fasta/metadata.xml
+++ b/sci-biology/scbi_fasta/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scbi_mapreduce/metadata.xml b/sci-biology/scbi_mapreduce/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/scbi_mapreduce/metadata.xml
+++ b/sci-biology/scbi_mapreduce/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scbi_plot/metadata.xml b/sci-biology/scbi_plot/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/scbi_plot/metadata.xml
+++ b/sci-biology/scbi_plot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sclust/metadata.xml b/sci-biology/sclust/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/sclust/metadata.xml
+++ b/sci-biology/sclust/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/screed/metadata.xml b/sci-biology/screed/metadata.xml
index 564aab4..65a0f98 100644
--- a/sci-biology/screed/metadata.xml
+++ b/sci-biology/screed/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/scythe/metadata.xml b/sci-biology/scythe/metadata.xml
index 31de6d1..09173ee 100644
--- a/sci-biology/scythe/metadata.xml
+++ b/sci-biology/scythe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/seqclean/metadata.xml b/sci-biology/seqclean/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/seqclean/metadata.xml
+++ b/sci-biology/seqclean/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/seqtools/metadata.xml b/sci-biology/seqtools/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/seqtools/metadata.xml
+++ b/sci-biology/seqtools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sequin/metadata.xml b/sci-biology/sequin/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/sequin/metadata.xml
+++ b/sci-biology/sequin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sff_dump/metadata.xml b/sci-biology/sff_dump/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/sff_dump/metadata.xml
+++ b/sci-biology/sff_dump/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/sga/metadata.xml b/sci-biology/sga/metadata.xml
index 17507c3..8914453 100644
--- a/sci-biology/sga/metadata.xml
+++ b/sci-biology/sga/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sgp2/metadata.xml b/sci-biology/sgp2/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/sgp2/metadata.xml
+++ b/sci-biology/sgp2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/sickle/metadata.xml b/sci-biology/sickle/metadata.xml
index d8f6eb3..3bf94ce 100644
--- a/sci-biology/sickle/metadata.xml
+++ b/sci-biology/sickle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/signalp/metadata.xml b/sci-biology/signalp/metadata.xml
index 057825c..525e88d 100644
--- a/sci-biology/signalp/metadata.xml
+++ b/sci-biology/signalp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="unknown">
 		<email>weaver@gentoo.org</email>
 		<name>Andrey Kislyuk</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/skewer-bin/metadata.xml b/sci-biology/skewer-bin/metadata.xml
index a7ea8f1..ef427fa 100644
--- a/sci-biology/skewer-bin/metadata.xml
+++ b/sci-biology/skewer-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/smalt-bin/metadata.xml b/sci-biology/smalt-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/smalt-bin/metadata.xml
+++ b/sci-biology/smalt-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/snap/metadata.xml b/sci-biology/snap/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/snap/metadata.xml
+++ b/sci-biology/snap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/snphylo/metadata.xml b/sci-biology/snphylo/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/snphylo/metadata.xml
+++ b/sci-biology/snphylo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/spm/metadata.xml b/sci-biology/spm/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/spm/metadata.xml
+++ b/sci-biology/spm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/sra_sdk/metadata.xml b/sci-biology/sra_sdk/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/sra_sdk/metadata.xml
+++ b/sci-biology/sra_sdk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ssaha2-bin/metadata.xml b/sci-biology/ssaha2-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/ssaha2-bin/metadata.xml
+++ b/sci-biology/ssaha2-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/stacks/metadata.xml b/sci-biology/stacks/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/stacks/metadata.xml
+++ b/sci-biology/stacks/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/staden/metadata.xml b/sci-biology/staden/metadata.xml
index 9ebfbac..495d3ba 100644
--- a/sci-biology/staden/metadata.xml
+++ b/sci-biology/staden/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/subread/metadata.xml b/sci-biology/subread/metadata.xml
index eead5ca..8e4c818 100644
--- a/sci-biology/subread/metadata.xml
+++ b/sci-biology/subread/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/swissknife/metadata.xml b/sci-biology/swissknife/metadata.xml
index 5cddc26..e3353da 100644
--- a/sci-biology/swissknife/metadata.xml
+++ b/sci-biology/swissknife/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/symap/metadata.xml b/sci-biology/symap/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-biology/symap/metadata.xml
+++ b/sci-biology/symap/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-biology/tablet-bin/metadata.xml b/sci-biology/tablet-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/tablet-bin/metadata.xml
+++ b/sci-biology/tablet-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/tablet/metadata.xml b/sci-biology/tablet/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/tablet/metadata.xml
+++ b/sci-biology/tablet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/tagdust/metadata.xml b/sci-biology/tagdust/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/tagdust/metadata.xml
+++ b/sci-biology/tagdust/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/tclust/metadata.xml b/sci-biology/tclust/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/tclust/metadata.xml
+++ b/sci-biology/tclust/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/tgicl/metadata.xml b/sci-biology/tgicl/metadata.xml
index 269afdc..7fad0fd 100644
--- a/sci-biology/tgicl/metadata.xml
+++ b/sci-biology/tgicl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/tigr-foundation-libs/metadata.xml b/sci-biology/tigr-foundation-libs/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/tigr-foundation-libs/metadata.xml
+++ b/sci-biology/tigr-foundation-libs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/tmhmm/metadata.xml b/sci-biology/tmhmm/metadata.xml
index 057825c..525e88d 100644
--- a/sci-biology/tmhmm/metadata.xml
+++ b/sci-biology/tmhmm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="unknown">
 		<email>weaver@gentoo.org</email>
 		<name>Andrey Kislyuk</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/tophat/metadata.xml b/sci-biology/tophat/metadata.xml
index 7cf7755..dce054e 100644
--- a/sci-biology/tophat/metadata.xml
+++ b/sci-biology/tophat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/trans-abyss/metadata.xml b/sci-biology/trans-abyss/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/trans-abyss/metadata.xml
+++ b/sci-biology/trans-abyss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/trf/metadata.xml b/sci-biology/trf/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/trf/metadata.xml
+++ b/sci-biology/trf/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/trim_galore/metadata.xml b/sci-biology/trim_galore/metadata.xml
index 5b9a598..1d67411 100644
--- a/sci-biology/trim_galore/metadata.xml
+++ b/sci-biology/trim_galore/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>mmokrejs@fold.natur.cuni.cz</email>
 		<name>Martin Mokrejs</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>

diff --git a/sci-biology/trimmomatic/metadata.xml b/sci-biology/trimmomatic/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/trimmomatic/metadata.xml
+++ b/sci-biology/trimmomatic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/trinityrnaseq/metadata.xml b/sci-biology/trinityrnaseq/metadata.xml
index b3251e4..5c82601 100644
--- a/sci-biology/trinityrnaseq/metadata.xml
+++ b/sci-biology/trinityrnaseq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/trowel/metadata.xml b/sci-biology/trowel/metadata.xml
index 74f4323..111e2c6 100644
--- a/sci-biology/trowel/metadata.xml
+++ b/sci-biology/trowel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/twinscan/metadata.xml b/sci-biology/twinscan/metadata.xml
index 08dad0e..4ef78c3 100644
--- a/sci-biology/twinscan/metadata.xml
+++ b/sci-biology/twinscan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/ugene/metadata.xml b/sci-biology/ugene/metadata.xml
index 6a41a64..19f7276 100644
--- a/sci-biology/ugene/metadata.xml
+++ b/sci-biology/ugene/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-biology/vague-bin/metadata.xml b/sci-biology/vague-bin/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/vague-bin/metadata.xml
+++ b/sci-biology/vague-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/velvetk/metadata.xml b/sci-biology/velvetk/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/velvetk/metadata.xml
+++ b/sci-biology/velvetk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/wcd/metadata.xml b/sci-biology/wcd/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/wcd/metadata.xml
+++ b/sci-biology/wcd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/weblogo/metadata.xml b/sci-biology/weblogo/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/weblogo/metadata.xml
+++ b/sci-biology/weblogo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/wgs-assembler/metadata.xml b/sci-biology/wgs-assembler/metadata.xml
index 3b4bdca..fa8a259 100644
--- a/sci-biology/wgs-assembler/metadata.xml
+++ b/sci-biology/wgs-assembler/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/wise/metadata.xml b/sci-biology/wise/metadata.xml
index 8b0589b..959160f 100644
--- a/sci-biology/wise/metadata.xml
+++ b/sci-biology/wise/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-biology/zmsort/metadata.xml b/sci-biology/zmsort/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-biology/zmsort/metadata.xml
+++ b/sci-biology/zmsort/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-chemistry/GromacsWrapper/metadata.xml b/sci-chemistry/GromacsWrapper/metadata.xml
index 899a0ca..1675206 100644
--- a/sci-chemistry/GromacsWrapper/metadata.xml
+++ b/sci-chemistry/GromacsWrapper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/NMRdyn/metadata.xml b/sci-chemistry/NMRdyn/metadata.xml
index 0af4431..5670afe 100644
--- a/sci-chemistry/NMRdyn/metadata.xml
+++ b/sci-chemistry/NMRdyn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>

diff --git a/sci-chemistry/ambertools/metadata.xml b/sci-chemistry/ambertools/metadata.xml
index efda249..d10bde2 100644
--- a/sci-chemistry/ambertools/metadata.xml
+++ b/sci-chemistry/ambertools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/ball/metadata.xml b/sci-chemistry/ball/metadata.xml
index f0f50e8..9bf12a8 100644
--- a/sci-chemistry/ball/metadata.xml
+++ b/sci-chemistry/ball/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/burrow-owl/metadata.xml b/sci-chemistry/burrow-owl/metadata.xml
index aa5d865..776713a 100644
--- a/sci-chemistry/burrow-owl/metadata.xml
+++ b/sci-chemistry/burrow-owl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/camshift/metadata.xml b/sci-chemistry/camshift/metadata.xml
index c87fc31..4ac68c1 100644
--- a/sci-chemistry/camshift/metadata.xml
+++ b/sci-chemistry/camshift/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-chemistry@gentoo.org</email>
 	<name>Gentoo Chemistry Project</name>
 </maintainer>

diff --git a/sci-chemistry/chemBuild/metadata.xml b/sci-chemistry/chemBuild/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/chemBuild/metadata.xml
+++ b/sci-chemistry/chemBuild/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/chimera-bin/metadata.xml b/sci-chemistry/chimera-bin/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/chimera-bin/metadata.xml
+++ b/sci-chemistry/chimera-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/chooch/metadata.xml b/sci-chemistry/chooch/metadata.xml
index c87fc31..4ac68c1 100644
--- a/sci-chemistry/chooch/metadata.xml
+++ b/sci-chemistry/chooch/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-chemistry@gentoo.org</email>
 	<name>Gentoo Chemistry Project</name>
 </maintainer>

diff --git a/sci-chemistry/cnsface/metadata.xml b/sci-chemistry/cnsface/metadata.xml
index 94ea173..2804b70 100644
--- a/sci-chemistry/cnsface/metadata.xml
+++ b/sci-chemistry/cnsface/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/concoord/metadata.xml b/sci-chemistry/concoord/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/concoord/metadata.xml
+++ b/sci-chemistry/concoord/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/coot/metadata.xml b/sci-chemistry/coot/metadata.xml
index f5bdf94..f3af354 100644
--- a/sci-chemistry/coot/metadata.xml
+++ b/sci-chemistry/coot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/cpmgfit/metadata.xml b/sci-chemistry/cpmgfit/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/cpmgfit/metadata.xml
+++ b/sci-chemistry/cpmgfit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/cs-rosetta/metadata.xml b/sci-chemistry/cs-rosetta/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/cs-rosetta/metadata.xml
+++ b/sci-chemistry/cs-rosetta/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/curvefit/metadata.xml b/sci-chemistry/curvefit/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/curvefit/metadata.xml
+++ b/sci-chemistry/curvefit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/dl_poly/metadata.xml b/sci-chemistry/dl_poly/metadata.xml
index 36b8a6e..6f0f3dc 100644
--- a/sci-chemistry/dl_poly/metadata.xml
+++ b/sci-chemistry/dl_poly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/drawxtl/metadata.xml b/sci-chemistry/drawxtl/metadata.xml
index edfe8f4..9fb449f 100644
--- a/sci-chemistry/drawxtl/metadata.xml
+++ b/sci-chemistry/drawxtl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/dssp2pdb/metadata.xml b/sci-chemistry/dssp2pdb/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/dssp2pdb/metadata.xml
+++ b/sci-chemistry/dssp2pdb/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/erkale/metadata.xml b/sci-chemistry/erkale/metadata.xml
index 9b1271e..4e7eadb 100644
--- a/sci-chemistry/erkale/metadata.xml
+++ b/sci-chemistry/erkale/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>rei4dan@gmail.com</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/freeon/metadata.xml b/sci-chemistry/freeon/metadata.xml
index cffac18..581c987 100644
--- a/sci-chemistry/freeon/metadata.xml
+++ b/sci-chemistry/freeon/metadata.xml
@@ -4,11 +4,11 @@
   <longdescription lang="en">
 		FreeON is an experimental, open source (GPL) suite of programs for linear scaling quantum chemistry.
 	</longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>nicolasbock@gentoo.org</email>
     <name>Nicolas Bock</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/gamess/metadata.xml b/sci-chemistry/gamess/metadata.xml
index 9007628..f255ea0 100644
--- a/sci-chemistry/gamess/metadata.xml
+++ b/sci-chemistry/gamess/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index 59de1f2..7b53e54 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/hydronmr/metadata.xml b/sci-chemistry/hydronmr/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/hydronmr/metadata.xml
+++ b/sci-chemistry/hydronmr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/jana2000/metadata.xml b/sci-chemistry/jana2000/metadata.xml
index 3953c89..da36ecb 100644
--- a/sci-chemistry/jana2000/metadata.xml
+++ b/sci-chemistry/jana2000/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/jligand/metadata.xml b/sci-chemistry/jligand/metadata.xml
index 3953c89..da36ecb 100644
--- a/sci-chemistry/jligand/metadata.xml
+++ b/sci-chemistry/jligand/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/ligplot+/metadata.xml b/sci-chemistry/ligplot+/metadata.xml
index 3953c89..da36ecb 100644
--- a/sci-chemistry/ligplot+/metadata.xml
+++ b/sci-chemistry/ligplot+/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/mage/metadata.xml b/sci-chemistry/mage/metadata.xml
index c87fc31..4ac68c1 100644
--- a/sci-chemistry/mage/metadata.xml
+++ b/sci-chemistry/mage/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-chemistry@gentoo.org</email>
 	<name>Gentoo Chemistry Project</name>
 </maintainer>

diff --git a/sci-chemistry/mddnmr/metadata.xml b/sci-chemistry/mddnmr/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mddnmr/metadata.xml
+++ b/sci-chemistry/mddnmr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mdsctk/metadata.xml b/sci-chemistry/mdsctk/metadata.xml
index 66616a7..824d5f0 100644
--- a/sci-chemistry/mdsctk/metadata.xml
+++ b/sci-chemistry/mdsctk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-autodocktools/metadata.xml b/sci-chemistry/mgltools-autodocktools/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-autodocktools/metadata.xml
+++ b/sci-chemistry/mgltools-autodocktools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-bhtree/metadata.xml b/sci-chemistry/mgltools-bhtree/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-bhtree/metadata.xml
+++ b/sci-chemistry/mgltools-bhtree/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-cadd/metadata.xml b/sci-chemistry/mgltools-cadd/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-cadd/metadata.xml
+++ b/sci-chemistry/mgltools-cadd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-cmolkit/metadata.xml b/sci-chemistry/mgltools-cmolkit/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-cmolkit/metadata.xml
+++ b/sci-chemistry/mgltools-cmolkit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-dejavu/metadata.xml b/sci-chemistry/mgltools-dejavu/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-dejavu/metadata.xml
+++ b/sci-chemistry/mgltools-dejavu/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-geomutils/metadata.xml b/sci-chemistry/mgltools-geomutils/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-geomutils/metadata.xml
+++ b/sci-chemistry/mgltools-geomutils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-gle/metadata.xml b/sci-chemistry/mgltools-gle/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-gle/metadata.xml
+++ b/sci-chemistry/mgltools-gle/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-mglutil/metadata.xml b/sci-chemistry/mgltools-mglutil/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-mglutil/metadata.xml
+++ b/sci-chemistry/mgltools-mglutil/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-molkit/metadata.xml b/sci-chemistry/mgltools-molkit/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-molkit/metadata.xml
+++ b/sci-chemistry/mgltools-molkit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-networkeditor/metadata.xml b/sci-chemistry/mgltools-networkeditor/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-networkeditor/metadata.xml
+++ b/sci-chemistry/mgltools-networkeditor/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-opengltk/metadata.xml b/sci-chemistry/mgltools-opengltk/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-opengltk/metadata.xml
+++ b/sci-chemistry/mgltools-opengltk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-pmv/metadata.xml b/sci-chemistry/mgltools-pmv/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-pmv/metadata.xml
+++ b/sci-chemistry/mgltools-pmv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-pyautodock/metadata.xml b/sci-chemistry/mgltools-pyautodock/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-pyautodock/metadata.xml
+++ b/sci-chemistry/mgltools-pyautodock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-pybabel/metadata.xml b/sci-chemistry/mgltools-pybabel/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-pybabel/metadata.xml
+++ b/sci-chemistry/mgltools-pybabel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-pyglf/metadata.xml b/sci-chemistry/mgltools-pyglf/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-pyglf/metadata.xml
+++ b/sci-chemistry/mgltools-pyglf/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-qslimlib/metadata.xml b/sci-chemistry/mgltools-qslimlib/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-qslimlib/metadata.xml
+++ b/sci-chemistry/mgltools-qslimlib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-scenario2/metadata.xml b/sci-chemistry/mgltools-scenario2/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-scenario2/metadata.xml
+++ b/sci-chemistry/mgltools-scenario2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-sff/metadata.xml b/sci-chemistry/mgltools-sff/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-sff/metadata.xml
+++ b/sci-chemistry/mgltools-sff/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-support/metadata.xml b/sci-chemistry/mgltools-support/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-support/metadata.xml
+++ b/sci-chemistry/mgltools-support/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-symserv/metadata.xml b/sci-chemistry/mgltools-symserv/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-symserv/metadata.xml
+++ b/sci-chemistry/mgltools-symserv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-utpackages/metadata.xml b/sci-chemistry/mgltools-utpackages/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-utpackages/metadata.xml
+++ b/sci-chemistry/mgltools-utpackages/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-viewer-framework/metadata.xml b/sci-chemistry/mgltools-viewer-framework/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-viewer-framework/metadata.xml
+++ b/sci-chemistry/mgltools-viewer-framework/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-vision/metadata.xml b/sci-chemistry/mgltools-vision/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-vision/metadata.xml
+++ b/sci-chemistry/mgltools-vision/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-visionlib/metadata.xml b/sci-chemistry/mgltools-visionlib/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-visionlib/metadata.xml
+++ b/sci-chemistry/mgltools-visionlib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-volume/metadata.xml b/sci-chemistry/mgltools-volume/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-volume/metadata.xml
+++ b/sci-chemistry/mgltools-volume/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools-webservices/metadata.xml b/sci-chemistry/mgltools-webservices/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools-webservices/metadata.xml
+++ b/sci-chemistry/mgltools-webservices/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mgltools/metadata.xml b/sci-chemistry/mgltools/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mgltools/metadata.xml
+++ b/sci-chemistry/mgltools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mics/metadata.xml b/sci-chemistry/mics/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mics/metadata.xml
+++ b/sci-chemistry/mics/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/modelfree/metadata.xml b/sci-chemistry/modelfree/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/modelfree/metadata.xml
+++ b/sci-chemistry/modelfree/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/modeller/metadata.xml b/sci-chemistry/modeller/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/modeller/metadata.xml
+++ b/sci-chemistry/modeller/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/module2/metadata.xml b/sci-chemistry/module2/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/module2/metadata.xml
+++ b/sci-chemistry/module2/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mtz2hkl/metadata.xml b/sci-chemistry/mtz2hkl/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mtz2hkl/metadata.xml
+++ b/sci-chemistry/mtz2hkl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/mtz2sca/metadata.xml b/sci-chemistry/mtz2sca/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/mtz2sca/metadata.xml
+++ b/sci-chemistry/mtz2sca/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/nMOLDYN/metadata.xml b/sci-chemistry/nMOLDYN/metadata.xml
index ec3e234..c2dc156 100644
--- a/sci-chemistry/nMOLDYN/metadata.xml
+++ b/sci-chemistry/nMOLDYN/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/nmrpipe/metadata.xml b/sci-chemistry/nmrpipe/metadata.xml
index f5bdf94..f3af354 100644
--- a/sci-chemistry/nmrpipe/metadata.xml
+++ b/sci-chemistry/nmrpipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/nmrview/metadata.xml b/sci-chemistry/nmrview/metadata.xml
index f5bdf94..f3af354 100644
--- a/sci-chemistry/nmrview/metadata.xml
+++ b/sci-chemistry/nmrview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/nwchem/metadata.xml b/sci-chemistry/nwchem/metadata.xml
index 3fed2b3..7532c37 100644
--- a/sci-chemistry/nwchem/metadata.xml
+++ b/sci-chemistry/nwchem/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/openbabel-java/metadata.xml b/sci-chemistry/openbabel-java/metadata.xml
index ab098fa..89e965e 100644
--- a/sci-chemistry/openbabel-java/metadata.xml
+++ b/sci-chemistry/openbabel-java/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/openbabel-perl/metadata.xml b/sci-chemistry/openbabel-perl/metadata.xml
index f1d2bc7..08a5886 100644
--- a/sci-chemistry/openbabel-perl/metadata.xml
+++ b/sci-chemistry/openbabel-perl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/openbabel-python/metadata.xml b/sci-chemistry/openbabel-python/metadata.xml
index efd8968..b332bc4 100644
--- a/sci-chemistry/openbabel-python/metadata.xml
+++ b/sci-chemistry/openbabel-python/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/openbabel-ruby/metadata.xml b/sci-chemistry/openbabel-ruby/metadata.xml
index 6ef9c6d..2988de9 100644
--- a/sci-chemistry/openbabel-ruby/metadata.xml
+++ b/sci-chemistry/openbabel-ruby/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 6fe890f..1508b8c 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/pales-bin/metadata.xml b/sci-chemistry/pales-bin/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/pales-bin/metadata.xml
+++ b/sci-chemistry/pales-bin/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/panav/metadata.xml b/sci-chemistry/panav/metadata.xml
index 4c1a9f1..b5d9f11 100644
--- a/sci-chemistry/panav/metadata.xml
+++ b/sci-chemistry/panav/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/pesto/metadata.xml b/sci-chemistry/pesto/metadata.xml
index 5a6c1e8..75fae4e 100644
--- a/sci-chemistry/pesto/metadata.xml
+++ b/sci-chemistry/pesto/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/phenix-bin/metadata.xml b/sci-chemistry/phenix-bin/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/phenix-bin/metadata.xml
+++ b/sci-chemistry/phenix-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/polygon/metadata.xml b/sci-chemistry/polygon/metadata.xml
index c87fc31..4ac68c1 100644
--- a/sci-chemistry/polygon/metadata.xml
+++ b/sci-chemistry/polygon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-chemistry@gentoo.org</email>
 	<name>Gentoo Chemistry Project</name>
 </maintainer>

diff --git a/sci-chemistry/pymol-plugins-ezviz/metadata.xml b/sci-chemistry/pymol-plugins-ezviz/metadata.xml
index 1bbb577..e8b07ec 100644
--- a/sci-chemistry/pymol-plugins-ezviz/metadata.xml
+++ b/sci-chemistry/pymol-plugins-ezviz/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/pymol-plugins-psico/metadata.xml b/sci-chemistry/pymol-plugins-psico/metadata.xml
index d972455..1853602 100644
--- a/sci-chemistry/pymol-plugins-psico/metadata.xml
+++ b/sci-chemistry/pymol-plugins-psico/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index a48f085..f1194d1 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/pyquante/metadata.xml b/sci-chemistry/pyquante/metadata.xml
index 666fab0..001c3b3 100644
--- a/sci-chemistry/pyquante/metadata.xml
+++ b/sci-chemistry/pyquante/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/redcat/metadata.xml b/sci-chemistry/redcat/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/redcat/metadata.xml
+++ b/sci-chemistry/redcat/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/rosetta-tools/metadata.xml b/sci-chemistry/rosetta-tools/metadata.xml
index bc68956..fa775fc 100644
--- a/sci-chemistry/rosetta-tools/metadata.xml
+++ b/sci-chemistry/rosetta-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/rosetta/metadata.xml b/sci-chemistry/rosetta/metadata.xml
index fc4e011..768f3c0 100644
--- a/sci-chemistry/rosetta/metadata.xml
+++ b/sci-chemistry/rosetta/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/shiftx/metadata.xml b/sci-chemistry/shiftx/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/shiftx/metadata.xml
+++ b/sci-chemistry/shiftx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/shiftx2/metadata.xml b/sci-chemistry/shiftx2/metadata.xml
index 2ee3c05..0af8b97 100644
--- a/sci-chemistry/shiftx2/metadata.xml
+++ b/sci-chemistry/shiftx2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/simpson/metadata.xml b/sci-chemistry/simpson/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/simpson/metadata.xml
+++ b/sci-chemistry/simpson/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/smmp/metadata.xml b/sci-chemistry/smmp/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/smmp/metadata.xml
+++ b/sci-chemistry/smmp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/specView/metadata.xml b/sci-chemistry/specView/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/specView/metadata.xml
+++ b/sci-chemistry/specView/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/ssp/metadata.xml b/sci-chemistry/ssp/metadata.xml
index dc51cb9..bce834c 100644
--- a/sci-chemistry/ssp/metadata.xml
+++ b/sci-chemistry/ssp/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/talosn/metadata.xml b/sci-chemistry/talosn/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/talosn/metadata.xml
+++ b/sci-chemistry/talosn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/trajng/metadata.xml b/sci-chemistry/trajng/metadata.xml
index ec3e234..c2dc156 100644
--- a/sci-chemistry/trajng/metadata.xml
+++ b/sci-chemistry/trajng/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/unio/metadata.xml b/sci-chemistry/unio/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/unio/metadata.xml
+++ b/sci-chemistry/unio/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/usf-tools/metadata.xml b/sci-chemistry/usf-tools/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-chemistry/usf-tools/metadata.xml
+++ b/sci-chemistry/usf-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index d05e7fe..2559954 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
index 36b8a6e..6f0f3dc 100644
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ b/sci-chemistry/votca-csgapps/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-chemistry/wxmacmolplt/metadata.xml b/sci-chemistry/wxmacmolplt/metadata.xml
index 5d15bd4..19df984 100644
--- a/sci-chemistry/wxmacmolplt/metadata.xml
+++ b/sci-chemistry/wxmacmolplt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-chemistry/xplor-nih/metadata.xml b/sci-chemistry/xplor-nih/metadata.xml
index 7bc6ee8..7c5a822 100644
--- a/sci-chemistry/xplor-nih/metadata.xml
+++ b/sci-chemistry/xplor-nih/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>

diff --git a/sci-electronics/minipro/metadata.xml b/sci-electronics/minipro/metadata.xml
index e227911..c5ec74e 100644
--- a/sci-electronics/minipro/metadata.xml
+++ b/sci-electronics/minipro/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>

diff --git a/sci-electronics/player/metadata.xml b/sci-electronics/player/metadata.xml
index c697776..f4fe34e 100644
--- a/sci-electronics/player/metadata.xml
+++ b/sci-electronics/player/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>

diff --git a/sci-electronics/stage/metadata.xml b/sci-electronics/stage/metadata.xml
index efbeb69..21b7cf2 100644
--- a/sci-electronics/stage/metadata.xml
+++ b/sci-electronics/stage/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>

diff --git a/sci-electronics/tnt/metadata.xml b/sci-electronics/tnt/metadata.xml
index 6a49bdf..4422f5d 100644
--- a/sci-electronics/tnt/metadata.xml
+++ b/sci-electronics/tnt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap/metadata.xml b/sci-geosciences/pydap/metadata.xml
index bcd52fd..7ab5612 100644
--- a/sci-geosciences/pydap/metadata.xml
+++ b/sci-geosciences/pydap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_cdms/metadata.xml b/sci-geosciences/pydap_handlers_cdms/metadata.xml
index 13f2f87..2cf9da1 100644
--- a/sci-geosciences/pydap_handlers_cdms/metadata.xml
+++ b/sci-geosciences/pydap_handlers_cdms/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_csv/metadata.xml b/sci-geosciences/pydap_handlers_csv/metadata.xml
index 06fed44..aefbff0 100644
--- a/sci-geosciences/pydap_handlers_csv/metadata.xml
+++ b/sci-geosciences/pydap_handlers_csv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_hdf5/metadata.xml b/sci-geosciences/pydap_handlers_hdf5/metadata.xml
index 12a847f..3c284fa 100644
--- a/sci-geosciences/pydap_handlers_hdf5/metadata.xml
+++ b/sci-geosciences/pydap_handlers_hdf5/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_nca/metadata.xml b/sci-geosciences/pydap_handlers_nca/metadata.xml
index ffd2236..ff2895a 100644
--- a/sci-geosciences/pydap_handlers_nca/metadata.xml
+++ b/sci-geosciences/pydap_handlers_nca/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_netcdf/metadata.xml b/sci-geosciences/pydap_handlers_netcdf/metadata.xml
index 672311c..f0ac58a 100644
--- a/sci-geosciences/pydap_handlers_netcdf/metadata.xml
+++ b/sci-geosciences/pydap_handlers_netcdf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_proxy/metadata.xml b/sci-geosciences/pydap_handlers_proxy/metadata.xml
index 6922e85..aaaa997 100644
--- a/sci-geosciences/pydap_handlers_proxy/metadata.xml
+++ b/sci-geosciences/pydap_handlers_proxy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_sql/metadata.xml b/sci-geosciences/pydap_handlers_sql/metadata.xml
index c1a5767..c34bad9 100644
--- a/sci-geosciences/pydap_handlers_sql/metadata.xml
+++ b/sci-geosciences/pydap_handlers_sql/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_handlers_sqlite/metadata.xml b/sci-geosciences/pydap_handlers_sqlite/metadata.xml
index 7a454a4..b6d9d28 100644
--- a/sci-geosciences/pydap_handlers_sqlite/metadata.xml
+++ b/sci-geosciences/pydap_handlers_sqlite/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_responses_kml/metadata.xml b/sci-geosciences/pydap_responses_kml/metadata.xml
index 862ebcd..4f434c8 100644
--- a/sci-geosciences/pydap_responses_kml/metadata.xml
+++ b/sci-geosciences/pydap_responses_kml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_responses_matlab/metadata.xml b/sci-geosciences/pydap_responses_matlab/metadata.xml
index 11d3219..c373db3 100644
--- a/sci-geosciences/pydap_responses_matlab/metadata.xml
+++ b/sci-geosciences/pydap_responses_matlab/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_responses_netcdf/metadata.xml b/sci-geosciences/pydap_responses_netcdf/metadata.xml
index 9baf787..5961ef3 100644
--- a/sci-geosciences/pydap_responses_netcdf/metadata.xml
+++ b/sci-geosciences/pydap_responses_netcdf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_responses_wms/metadata.xml b/sci-geosciences/pydap_responses_wms/metadata.xml
index 94779bc..412e8be 100644
--- a/sci-geosciences/pydap_responses_wms/metadata.xml
+++ b/sci-geosciences/pydap_responses_wms/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/pydap_responses_xls/metadata.xml b/sci-geosciences/pydap_responses_xls/metadata.xml
index 74bf2b0..635bb94 100644
--- a/sci-geosciences/pydap_responses_xls/metadata.xml
+++ b/sci-geosciences/pydap_responses_xls/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 92716b4..a476a4b 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-libs/Cgraph/metadata.xml b/sci-libs/Cgraph/metadata.xml
index 3317f16..ae9640f 100644
--- a/sci-libs/Cgraph/metadata.xml
+++ b/sci-libs/Cgraph/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/acml/metadata.xml b/sci-libs/acml/metadata.xml
index 5e243d2..90ed011 100644
--- a/sci-libs/acml/metadata.xml
+++ b/sci-libs/acml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/amber99sb_phipsi/metadata.xml b/sci-libs/amber99sb_phipsi/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-libs/amber99sb_phipsi/metadata.xml
+++ b/sci-libs/amber99sb_phipsi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/amber99sbnmr-ildn/metadata.xml b/sci-libs/amber99sbnmr-ildn/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-libs/amber99sbnmr-ildn/metadata.xml
+++ b/sci-libs/amber99sbnmr-ildn/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/amber99sbnmr/metadata.xml b/sci-libs/amber99sbnmr/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-libs/amber99sbnmr/metadata.xml
+++ b/sci-libs/amber99sbnmr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/amdlibm/metadata.xml b/sci-libs/amdlibm/metadata.xml
index 80c2a1d..75ed97c 100644
--- a/sci-libs/amdlibm/metadata.xml
+++ b/sci-libs/amdlibm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 3f87126..9c37618 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/arrayfire/metadata.xml b/sci-libs/arrayfire/metadata.xml
index c6a9bc4..9903267 100644
--- a/sci-libs/arrayfire/metadata.xml
+++ b/sci-libs/arrayfire/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/asl/metadata.xml b/sci-libs/asl/metadata.xml
index 6b29761..694b2ac 100644
--- a/sci-libs/asl/metadata.xml
+++ b/sci-libs/asl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>bircoph@gentoo.org</email>
   <name>Andrew Savchenko</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
   <email>sci-physics@gentoo.org</email>
   <name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index bf758f5..79b47d5 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/bigdft-abi/metadata.xml b/sci-libs/bigdft-abi/metadata.xml
index 15842a9..1f6b96a 100644
--- a/sci-libs/bigdft-abi/metadata.xml
+++ b/sci-libs/bigdft-abi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-libs/blas-reference/metadata.xml b/sci-libs/blas-reference/metadata.xml
index 4d78aa1..347cfa2 100644
--- a/sci-libs/blas-reference/metadata.xml
+++ b/sci-libs/blas-reference/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/blastdb/metadata.xml b/sci-libs/blastdb/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-libs/blastdb/metadata.xml
+++ b/sci-libs/blastdb/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/bloom/metadata.xml b/sci-libs/bloom/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-libs/bloom/metadata.xml
+++ b/sci-libs/bloom/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-libs/calculix-ccx/metadata.xml b/sci-libs/calculix-ccx/metadata.xml
index 365e130..aecb232 100644
--- a/sci-libs/calculix-ccx/metadata.xml
+++ b/sci-libs/calculix-ccx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/calculix-cgx/metadata.xml b/sci-libs/calculix-cgx/metadata.xml
index 3317f16..ae9640f 100644
--- a/sci-libs/calculix-cgx/metadata.xml
+++ b/sci-libs/calculix-cgx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/cblas-reference/metadata.xml b/sci-libs/cblas-reference/metadata.xml
index 098f891..c43dfae 100644
--- a/sci-libs/cblas-reference/metadata.xml
+++ b/sci-libs/cblas-reference/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/ccif/metadata.xml b/sci-libs/ccif/metadata.xml
index 0bfbf55..f9c187d 100644
--- a/sci-libs/ccif/metadata.xml
+++ b/sci-libs/ccif/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>jlec@gentoo.org</email>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/cgnstools/metadata.xml b/sci-libs/cgnstools/metadata.xml
index 69d5a9d..b0a18c5 100644
--- a/sci-libs/cgnstools/metadata.xml
+++ b/sci-libs/cgnstools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/clblas/metadata.xml b/sci-libs/clblas/metadata.xml
index cafd8d3..cad01ed 100644
--- a/sci-libs/clblas/metadata.xml
+++ b/sci-libs/clblas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/clfft/metadata.xml b/sci-libs/clfft/metadata.xml
index eadc602..b331d3e 100644
--- a/sci-libs/clfft/metadata.xml
+++ b/sci-libs/clfft/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/clrng/metadata.xml b/sci-libs/clrng/metadata.xml
index 41d9775..261dee5 100644
--- a/sci-libs/clrng/metadata.xml
+++ b/sci-libs/clrng/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/cs-rosetta-db/metadata.xml b/sci-libs/cs-rosetta-db/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-libs/cs-rosetta-db/metadata.xml
+++ b/sci-libs/cs-rosetta-db/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml
index 5a41cc8..fe4338a 100644
--- a/sci-libs/dcmtk/metadata.xml
+++ b/sci-libs/dcmtk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index cc1d147..d00e3da 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tamiko+GENTOO@kyomu.43-1.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/elmer-eio/metadata.xml b/sci-libs/elmer-eio/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-libs/elmer-eio/metadata.xml
+++ b/sci-libs/elmer-eio/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/elmer-hutiter/metadata.xml b/sci-libs/elmer-hutiter/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-libs/elmer-hutiter/metadata.xml
+++ b/sci-libs/elmer-hutiter/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/etsf_io/metadata.xml b/sci-libs/etsf_io/metadata.xml
index 013b7ba..5c8a361 100644
--- a/sci-libs/etsf_io/metadata.xml
+++ b/sci-libs/etsf_io/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 	</maintainer>
 	<use>

diff --git a/sci-libs/factory/metadata.xml b/sci-libs/factory/metadata.xml
index e079d54..5d8333c 100644
--- a/sci-libs/factory/metadata.xml
+++ b/sci-libs/factory/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tom111@gmx.de</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/fdlibm/metadata.xml b/sci-libs/fdlibm/metadata.xml
index 82e3f7d..17ece26 100644
--- a/sci-libs/fdlibm/metadata.xml
+++ b/sci-libs/fdlibm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 9eb62a2..2af1f22 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/fgsl/metadata.xml b/sci-libs/fgsl/metadata.xml
index 479cea8..628e006 100644
--- a/sci-libs/fgsl/metadata.xml
+++ b/sci-libs/fgsl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/fox/metadata.xml b/sci-libs/fox/metadata.xml
index 155c46f..fbb7cbc 100644
--- a/sci-libs/fox/metadata.xml
+++ b/sci-libs/fox/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/framewave/metadata.xml b/sci-libs/framewave/metadata.xml
index 9b901af..51caca6 100644
--- a/sci-libs/framewave/metadata.xml
+++ b/sci-libs/framewave/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/geom/metadata.xml b/sci-libs/geom/metadata.xml
index 2a0422f..d322fed 100644
--- a/sci-libs/geom/metadata.xml
+++ b/sci-libs/geom/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/ghmm/metadata.xml b/sci-libs/ghmm/metadata.xml
index f678245..ab84552 100644
--- a/sci-libs/ghmm/metadata.xml
+++ b/sci-libs/ghmm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>weaver@gentoo.org</email>
     <name>Andrey Kislyuk</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/givaro/metadata.xml b/sci-libs/givaro/metadata.xml
index de46904..90d08b5 100644
--- a/sci-libs/givaro/metadata.xml
+++ b/sci-libs/givaro/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 0f71599..8352a54 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/gotoblas2/metadata.xml b/sci-libs/gotoblas2/metadata.xml
index b8332d9..d808dc1 100644
--- a/sci-libs/gotoblas2/metadata.xml
+++ b/sci-libs/gotoblas2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 28ad560..6e2e8e1 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/iml/metadata.xml b/sci-libs/iml/metadata.xml
index f5ab752..673326d 100644
--- a/sci-libs/iml/metadata.xml
+++ b/sci-libs/iml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/ipp/metadata.xml b/sci-libs/ipp/metadata.xml
index ef852f3..b61694f 100644
--- a/sci-libs/ipp/metadata.xml
+++ b/sci-libs/ipp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index c1e149c..85453b5 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>maintainer-wanted@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-libs/jhdf5/metadata.xml b/sci-libs/jhdf5/metadata.xml
index 49ba8f4..1699e58 100644
--- a/sci-libs/jhdf5/metadata.xml
+++ b/sci-libs/jhdf5/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mmokrejs@fold.natur.cuni.cz</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-libs/k3match/metadata.xml b/sci-libs/k3match/metadata.xml
index e0cb55a..9165eac 100644
--- a/sci-libs/k3match/metadata.xml
+++ b/sci-libs/k3match/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>AstroFloyd@gmail.com</email>
     <name>AstroFloyd</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index d22c981..269de23 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/lapacke-reference/metadata.xml b/sci-libs/lapacke-reference/metadata.xml
index 7ff6168..7c08715 100644
--- a/sci-libs/lapacke-reference/metadata.xml
+++ b/sci-libs/lapacke-reference/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/lapackpp/metadata.xml b/sci-libs/lapackpp/metadata.xml
index 71b77b3..b3d88ba 100644
--- a/sci-libs/lapackpp/metadata.xml
+++ b/sci-libs/lapackpp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/libcgnsoo/metadata.xml b/sci-libs/libcgnsoo/metadata.xml
index da30299..b501da7 100644
--- a/sci-libs/libcgnsoo/metadata.xml
+++ b/sci-libs/libcgnsoo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/libfac/metadata.xml b/sci-libs/libfac/metadata.xml
index 3c37023..40ae88f 100644
--- a/sci-libs/libfac/metadata.xml
+++ b/sci-libs/libfac/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tom111@gmx.de</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 6dc6397..3d67af3 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -7,10 +7,10 @@
     architectures, be it multi-cores, GPUs, or large scale MPI
     clusters.
   </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sci-libs/libmatheval/metadata.xml b/sci-libs/libmatheval/metadata.xml
index b8dd609..a876529 100644
--- a/sci-libs/libmatheval/metadata.xml
+++ b/sci-libs/libmatheval/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>tomka@gentoo.org</email>
 <name>Thomas Kahle</name>
 </maintainer>
-<maintainer>
+<maintainer type="project">
 <email>sci@gentoo.org</email>
 <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/libmaus/metadata.xml b/sci-libs/libmaus/metadata.xml
index ecff374..1541e62 100644
--- a/sci-libs/libmaus/metadata.xml
+++ b/sci-libs/libmaus/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml
index f5b47d1..21ede2e 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/libspatialindex/metadata.xml b/sci-libs/libspatialindex/metadata.xml
index 5a84fc6..472a5c8 100644
--- a/sci-libs/libspatialindex/metadata.xml
+++ b/sci-libs/libspatialindex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>hasufell@posteo.de</email>
     <name>Julian Ospald</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-libs/libsufr/metadata.xml b/sci-libs/libsufr/metadata.xml
index ba42cc3..b3a575f 100644
--- a/sci-libs/libsufr/metadata.xml
+++ b/sci-libs/libsufr/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>AstroFloyd@gmail.com</email>
     <name>AstroFloyd</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-libs/libxc/metadata.xml
+++ b/sci-libs/libxc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/lmfit/metadata.xml b/sci-libs/lmfit/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-libs/lmfit/metadata.xml
+++ b/sci-libs/lmfit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/lwpr/metadata.xml b/sci-libs/lwpr/metadata.xml
index d9a34f2..d7f4e4a 100644
--- a/sci-libs/lwpr/metadata.xml
+++ b/sci-libs/lwpr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-libs/matc/metadata.xml b/sci-libs/matc/metadata.xml
index 5e42e45..271c393 100644
--- a/sci-libs/matc/metadata.xml
+++ b/sci-libs/matc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index f7bb205..0c6991d 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/mesquite/metadata.xml b/sci-libs/mesquite/metadata.xml
index 3317f16..ae9640f 100644
--- a/sci-libs/mesquite/metadata.xml
+++ b/sci-libs/mesquite/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 7f6c55e..0fff21e 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/mlpack/metadata.xml b/sci-libs/mlpack/metadata.xml
index 90e7e99..6a7ec95 100644
--- a/sci-libs/mlpack/metadata.xml
+++ b/sci-libs/mlpack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/modglue/metadata.xml b/sci-libs/modglue/metadata.xml
index f6ac5e0..2771304 100644
--- a/sci-libs/modglue/metadata.xml
+++ b/sci-libs/modglue/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/mpiblacs/metadata.xml b/sci-libs/mpiblacs/metadata.xml
index 2f5e445..70527ac 100644
--- a/sci-libs/mpiblacs/metadata.xml
+++ b/sci-libs/mpiblacs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/msms/metadata.xml b/sci-libs/msms/metadata.xml
index 0b7eb3b..8937bad 100644
--- a/sci-libs/msms/metadata.xml
+++ b/sci-libs/msms/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml
index cd24b1f..4ef5091 100644
--- a/sci-libs/nexus/metadata.xml
+++ b/sci-libs/nexus/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>c.kerr@embl-hamburg.de</email>
 		<name>Chris Kerr</name>
 		<description>I occasionally submit patches to NeXus</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/ni-visa/metadata.xml b/sci-libs/ni-visa/metadata.xml
index 5e7df8a..d7298d7 100644
--- a/sci-libs/ni-visa/metadata.xml
+++ b/sci-libs/ni-visa/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mail@akhuettel.de</email>
   </maintainer>
 </pkgmetadata>

diff --git a/sci-libs/nibabel/metadata.xml b/sci-libs/nibabel/metadata.xml
index c33647a..ed7842e 100644
--- a/sci-libs/nibabel/metadata.xml
+++ b/sci-libs/nibabel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/nipy/metadata.xml b/sci-libs/nipy/metadata.xml
index 412091a..3993b39 100644
--- a/sci-libs/nipy/metadata.xml
+++ b/sci-libs/nipy/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/nipype/metadata.xml b/sci-libs/nipype/metadata.xml
index 3cdd9db..a8e3ec1 100644
--- a/sci-libs/nipype/metadata.xml
+++ b/sci-libs/nipype/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>h.chr@mail.ru</email>
     <name>Horea Christian</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml
index 1a5f386..15261a7 100644
--- a/sci-libs/o2scl/metadata.xml
+++ b/sci-libs/o2scl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/oasa/metadata.xml b/sci-libs/oasa/metadata.xml
index f299b17..9b5c5b3 100644
--- a/sci-libs/oasa/metadata.xml
+++ b/sci-libs/oasa/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/omalloc/metadata.xml b/sci-libs/omalloc/metadata.xml
index 83cc6ff..aa62137 100644
--- a/sci-libs/omalloc/metadata.xml
+++ b/sci-libs/omalloc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tom111@gmx.de</email>
 		<name>Thomas Kahle</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 5a4087b..2bf0b42 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/openlibm/metadata.xml b/sci-libs/openlibm/metadata.xml
index c9bbf57..531a083 100644
--- a/sci-libs/openlibm/metadata.xml
+++ b/sci-libs/openlibm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/optpp/metadata.xml b/sci-libs/optpp/metadata.xml
index 31b03de..2ff39dd 100644
--- a/sci-libs/optpp/metadata.xml
+++ b/sci-libs/optpp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index a612cd6..35ac42b 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/pagmo/metadata.xml b/sci-libs/pagmo/metadata.xml
index 320e6b4..23ef370 100644
--- a/sci-libs/pagmo/metadata.xml
+++ b/sci-libs/pagmo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-libs/parmetis/metadata.xml b/sci-libs/parmetis/metadata.xml
index 2d7d60e..8859732 100644
--- a/sci-libs/parmetis/metadata.xml
+++ b/sci-libs/parmetis/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/pastix/metadata.xml b/sci-libs/pastix/metadata.xml
index a5d8ce6..439c512 100644
--- a/sci-libs/pastix/metadata.xml
+++ b/sci-libs/pastix/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml
index 14166e8..1524fec 100644
--- a/sci-libs/pfft/metadata.xml
+++ b/sci-libs/pfft/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/pg2plplot/metadata.xml b/sci-libs/pg2plplot/metadata.xml
index 851d329..a5b8e41 100644
--- a/sci-libs/pg2plplot/metadata.xml
+++ b/sci-libs/pg2plplot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>AstroFloyd@gmail.com</email>
     <name>AstroFloyd</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/plasma/metadata.xml b/sci-libs/plasma/metadata.xml
index 145da31..26d10d0 100644
--- a/sci-libs/plasma/metadata.xml
+++ b/sci-libs/plasma/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/pmx/metadata.xml b/sci-libs/pmx/metadata.xml
index c8dc59f..9880417 100644
--- a/sci-libs/pmx/metadata.xml
+++ b/sci-libs/pmx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/pydicom/metadata.xml b/sci-libs/pydicom/metadata.xml
index ff4f774..8d1c816 100644
--- a/sci-libs/pydicom/metadata.xml
+++ b/sci-libs/pydicom/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/rdkit/metadata.xml b/sci-libs/rdkit/metadata.xml
index 55d10f9..e612e10 100644
--- a/sci-libs/rdkit/metadata.xml
+++ b/sci-libs/rdkit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-libs/scalapack/metadata.xml b/sci-libs/scalapack/metadata.xml
index 5aa57cc..b538e0a 100644
--- a/sci-libs/scalapack/metadata.xml
+++ b/sci-libs/scalapack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 65352f1..8e05ce3 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/spglib/metadata.xml b/sci-libs/spglib/metadata.xml
index 582f184..4623ab6 100644
--- a/sci-libs/spglib/metadata.xml
+++ b/sci-libs/spglib/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/starparse/metadata.xml b/sci-libs/starparse/metadata.xml
index 7a1d4fc..62e9e44 100644
--- a/sci-libs/starparse/metadata.xml
+++ b/sci-libs/starparse/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/superlu_dist/metadata.xml b/sci-libs/superlu_dist/metadata.xml
index 113887c..e9f0348 100644
--- a/sci-libs/superlu_dist/metadata.xml
+++ b/sci-libs/superlu_dist/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/superlu_mt/metadata.xml b/sci-libs/superlu_mt/metadata.xml
index 0b3d831..2b1e34d 100644
--- a/sci-libs/superlu_mt/metadata.xml
+++ b/sci-libs/superlu_mt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml
index bb2fe2b..398b34e 100644
--- a/sci-libs/symengine/metadata.xml
+++ b/sci-libs/symengine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mschu.dev@gmail.com</email>
     <name>Michael Schubert</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-libs/symmetrica/metadata.xml b/sci-libs/symmetrica/metadata.xml
index 4a6d38f..147f974 100644
--- a/sci-libs/symmetrica/metadata.xml
+++ b/sci-libs/symmetrica/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/tmglib/metadata.xml b/sci-libs/tmglib/metadata.xml
index 31207c7..75d668a 100644
--- a/sci-libs/tmglib/metadata.xml
+++ b/sci-libs/tmglib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 6fe22ac..d409138 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>andyspiros@gmail.com</email>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 36b8a6e..6f0f3dc 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>

diff --git a/sci-libs/vxl/metadata.xml b/sci-libs/vxl/metadata.xml
index b1be23d..861740f 100644
--- a/sci-libs/vxl/metadata.xml
+++ b/sci-libs/vxl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/wannier90/metadata.xml b/sci-libs/wannier90/metadata.xml
index 3317f16..ae9640f 100644
--- a/sci-libs/wannier90/metadata.xml
+++ b/sci-libs/wannier90/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-libs/xblas/metadata.xml b/sci-libs/xblas/metadata.xml
index 510b41d..99b5eff 100644
--- a/sci-libs/xblas/metadata.xml
+++ b/sci-libs/xblas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
index df7339c..bac49d7 100644
--- a/sci-libs/xraylib/metadata.xml
+++ b/sci-libs/xraylib/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>cjk34@cam.ac.uk</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-libs/zarja/metadata.xml b/sci-libs/zarja/metadata.xml
index 2b56c16..e130046 100644
--- a/sci-libs/zarja/metadata.xml
+++ b/sci-libs/zarja/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index 658106c..c92d667 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tom111@gmx.de</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/Oid/metadata.xml b/sci-mathematics/Oid/metadata.xml
index d139b8b..11ac210 100644
--- a/sci-mathematics/Oid/metadata.xml
+++ b/sci-mathematics/Oid/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tom111@gmx.de</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/metadata.xml
index 223afea..24fc428 100644
--- a/sci-mathematics/acl2/metadata.xml
+++ b/sci-mathematics/acl2/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>dongxuli2011@gmail.com</email>
 		<name>Dongxu Li</name>
 		<description>Industrial strength theorem prover</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>

diff --git a/sci-mathematics/alt-ergo/metadata.xml b/sci-mathematics/alt-ergo/metadata.xml
index 952bfeb..8224139 100644
--- a/sci-mathematics/alt-ergo/metadata.xml
+++ b/sci-mathematics/alt-ergo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/apron/metadata.xml b/sci-mathematics/apron/metadata.xml
index 87d73c1..f83f440 100644
--- a/sci-mathematics/apron/metadata.xml
+++ b/sci-mathematics/apron/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/aribas/metadata.xml b/sci-mathematics/aribas/metadata.xml
index eb72063..1469013 100644
--- a/sci-mathematics/aribas/metadata.xml
+++ b/sci-mathematics/aribas/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>

diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml
index e38851b..d17eda6 100644
--- a/sci-mathematics/axiom/metadata.xml
+++ b/sci-mathematics/axiom/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/burrtools/metadata.xml b/sci-mathematics/burrtools/metadata.xml
index 30fac00..584b02f 100644
--- a/sci-mathematics/burrtools/metadata.xml
+++ b/sci-mathematics/burrtools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/cadabra/metadata.xml b/sci-mathematics/cadabra/metadata.xml
index 17ac822..b979364 100644
--- a/sci-mathematics/cadabra/metadata.xml
+++ b/sci-mathematics/cadabra/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/cdfplayer/metadata.xml b/sci-mathematics/cdfplayer/metadata.xml
index 6564496..eb6c020 100644
--- a/sci-mathematics/cdfplayer/metadata.xml
+++ b/sci-mathematics/cdfplayer/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>piatlicki@gmail.com</email>
 </maintainer>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-mathematics/cipi/metadata.xml b/sci-mathematics/cipi/metadata.xml
index a53b385..5099b33 100644
--- a/sci-mathematics/cipi/metadata.xml
+++ b/sci-mathematics/cipi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tom111@gmx.de</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/dolfin/metadata.xml b/sci-mathematics/dolfin/metadata.xml
index b1a2416..d36c386 100644
--- a/sci-mathematics/dolfin/metadata.xml
+++ b/sci-mathematics/dolfin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/dsfmt/metadata.xml b/sci-mathematics/dsfmt/metadata.xml
index c1f909e..4f1226e 100644
--- a/sci-mathematics/dsfmt/metadata.xml
+++ b/sci-mathematics/dsfmt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/flocq/metadata.xml b/sci-mathematics/flocq/metadata.xml
index 8374bb6..3ee13d2 100644
--- a/sci-mathematics/flocq/metadata.xml
+++ b/sci-mathematics/flocq/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-mathematics@gentoo.org</email>
 	<name>Gentoo Mathematics Project</name>
 </maintainer>

diff --git a/sci-mathematics/frama-c/metadata.xml b/sci-mathematics/frama-c/metadata.xml
index 6755063..3fefb78 100644
--- a/sci-mathematics/frama-c/metadata.xml
+++ b/sci-mathematics/frama-c/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/freefem++/metadata.xml b/sci-mathematics/freefem++/metadata.xml
index fefbcbc..b242c63 100644
--- a/sci-mathematics/freefem++/metadata.xml
+++ b/sci-mathematics/freefem++/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/gambit/metadata.xml b/sci-mathematics/gambit/metadata.xml
index a22f966..40fbb61 100644
--- a/sci-mathematics/gambit/metadata.xml
+++ b/sci-mathematics/gambit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>dongxuli2011@gmail.com</email>
     <name>Dongxu Li</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/gap/metadata.xml b/sci-mathematics/gap/metadata.xml
index 22aad47..65be48d 100644
--- a/sci-mathematics/gap/metadata.xml
+++ b/sci-mathematics/gap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>A.G.Grozin@inp.nsk.su</email>
     <name>Andrey Grozin</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/gappa/metadata.xml b/sci-mathematics/gappa/metadata.xml
index 59c5599..5d25226 100644
--- a/sci-mathematics/gappa/metadata.xml
+++ b/sci-mathematics/gappa/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/gappalib-coq/metadata.xml b/sci-mathematics/gappalib-coq/metadata.xml
index 9efd8af..f71ba2a 100644
--- a/sci-mathematics/gappalib-coq/metadata.xml
+++ b/sci-mathematics/gappalib-coq/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-mathematics@gentoo.org</email>
 	<name>Gentoo Mathematics Project</name>
 </maintainer>

diff --git a/sci-mathematics/giac/metadata.xml b/sci-mathematics/giac/metadata.xml
index 703d55d..38e8239 100644
--- a/sci-mathematics/giac/metadata.xml
+++ b/sci-mathematics/giac/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-mathematics@gentoo.org</email>
 	<name>Gentoo Mathematics Project</name>
 </maintainer>

diff --git a/sci-mathematics/gismo/metadata.xml b/sci-mathematics/gismo/metadata.xml
index c517ec5..d9e7096 100644
--- a/sci-mathematics/gismo/metadata.xml
+++ b/sci-mathematics/gismo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>harald.weiner@jku.at</email>
 		<name>Harald Weiner</name>
 	</maintainer>

diff --git a/sci-mathematics/htk/metadata.xml b/sci-mathematics/htk/metadata.xml
index 2fe9cd3..c948fe4 100644
--- a/sci-mathematics/htk/metadata.xml
+++ b/sci-mathematics/htk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>pedosb@gmail.com</email>
 		<name>Pedro Batista</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>

diff --git a/sci-mathematics/kash-bin/metadata.xml b/sci-mathematics/kash-bin/metadata.xml
index f7eb1fe..73bcc57 100644
--- a/sci-mathematics/kash-bin/metadata.xml
+++ b/sci-mathematics/kash-bin/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tomka@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/kayali/metadata.xml b/sci-mathematics/kayali/metadata.xml
index 998fcf3..c632436 100644
--- a/sci-mathematics/kayali/metadata.xml
+++ b/sci-mathematics/kayali/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/lattE-macchiato/metadata.xml b/sci-mathematics/lattE-macchiato/metadata.xml
index f2126f6..80f5588 100644
--- a/sci-mathematics/lattE-macchiato/metadata.xml
+++ b/sci-mathematics/lattE-macchiato/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tom111@gmx.de</email>
     <name>Thomas Kahle</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/libsfmt/metadata.xml b/sci-mathematics/libsfmt/metadata.xml
index e38851b..d17eda6 100644
--- a/sci-mathematics/libsfmt/metadata.xml
+++ b/sci-mathematics/libsfmt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/lie/metadata.xml b/sci-mathematics/lie/metadata.xml
index 149a188..5041a04 100644
--- a/sci-mathematics/lie/metadata.xml
+++ b/sci-mathematics/lie/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>

diff --git a/sci-mathematics/ltl2ba/metadata.xml b/sci-mathematics/ltl2ba/metadata.xml
index f7bb205..0c6991d 100644
--- a/sci-mathematics/ltl2ba/metadata.xml
+++ b/sci-mathematics/ltl2ba/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-mathematics/mdp/metadata.xml b/sci-mathematics/mdp/metadata.xml
index db80927..419ace4 100644
--- a/sci-mathematics/mdp/metadata.xml
+++ b/sci-mathematics/mdp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tim@cerazone.net</email>
     <name>Tim Cera</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/netgen/metadata.xml b/sci-mathematics/netgen/metadata.xml
index 5d8283e..7811ed6 100644
--- a/sci-mathematics/netgen/metadata.xml
+++ b/sci-mathematics/netgen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/open-axiom/metadata.xml b/sci-mathematics/open-axiom/metadata.xml
index 6066674..54d97e0 100644
--- a/sci-mathematics/open-axiom/metadata.xml
+++ b/sci-mathematics/open-axiom/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml
index 1333612..4a93a4e 100644
--- a/sci-mathematics/petsc/metadata.xml
+++ b/sci-mathematics/petsc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/pff/metadata.xml b/sci-mathematics/pff/metadata.xml
index 125a890..0d54bf6 100644
--- a/sci-mathematics/pff/metadata.xml
+++ b/sci-mathematics/pff/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-mathematics@gentoo.org</email>
 	<name>Gentoo Mathematics Project</name>
 </maintainer>

diff --git a/sci-mathematics/pulp/metadata.xml b/sci-mathematics/pulp/metadata.xml
index d62404a..c2c5bcc 100644
--- a/sci-mathematics/pulp/metadata.xml
+++ b/sci-mathematics/pulp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
index b1b89a6..0d9212f 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/surfer/metadata.xml b/sci-mathematics/surfer/metadata.xml
index e38851b..d17eda6 100644
--- a/sci-mathematics/surfer/metadata.xml
+++ b/sci-mathematics/surfer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/tisean/metadata.xml b/sci-mathematics/tisean/metadata.xml
index c1a990f..3be7b52 100644
--- a/sci-mathematics/tisean/metadata.xml
+++ b/sci-mathematics/tisean/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher (jlec)</name>
   </maintainer>

diff --git a/sci-mathematics/ufc/metadata.xml b/sci-mathematics/ufc/metadata.xml
index b4dc959..c26ddd0 100644
--- a/sci-mathematics/ufc/metadata.xml
+++ b/sci-mathematics/ufc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/why/metadata.xml b/sci-mathematics/why/metadata.xml
index 83a7d29..8bf80c2 100644
--- a/sci-mathematics/why/metadata.xml
+++ b/sci-mathematics/why/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>

diff --git a/sci-mathematics/why3/metadata.xml b/sci-mathematics/why3/metadata.xml
index 3a5dbe4..5b97cd1 100644
--- a/sci-mathematics/why3/metadata.xml
+++ b/sci-mathematics/why3/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-mathematics@gentoo.org</email>
   <name>Gentoo Mathematics Project</name>
 </maintainer>

diff --git a/sci-mathematics/yorick/metadata.xml b/sci-mathematics/yorick/metadata.xml
index f27bf7f..47fd43d 100644
--- a/sci-mathematics/yorick/metadata.xml
+++ b/sci-mathematics/yorick/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>A.G.Grozin@inp.nsk.su</email>
     <name>Andrey Grozin</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>

diff --git a/sci-mathematics/z3/metadata.xml b/sci-mathematics/z3/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-mathematics/z3/metadata.xml
+++ b/sci-mathematics/z3/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-elmergrid/metadata.xml b/sci-misc/elmer-elmergrid/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-misc/elmer-elmergrid/metadata.xml
+++ b/sci-misc/elmer-elmergrid/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-misc/elmer-fem/metadata.xml
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-front/metadata.xml b/sci-misc/elmer-front/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-misc/elmer-front/metadata.xml
+++ b/sci-misc/elmer-front/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
index 92701d1..a0f2a34 100644
--- a/sci-misc/elmer-gui/metadata.xml
+++ b/sci-misc/elmer-gui/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-meshgen2d/metadata.xml b/sci-misc/elmer-meshgen2d/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-misc/elmer-meshgen2d/metadata.xml
+++ b/sci-misc/elmer-meshgen2d/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-meta/metadata.xml b/sci-misc/elmer-meta/metadata.xml
index 721f543..8425c0d 100644
--- a/sci-misc/elmer-meta/metadata.xml
+++ b/sci-misc/elmer-meta/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/elmer-post/metadata.xml b/sci-misc/elmer-post/metadata.xml
index 7fece6f..74cf8e4 100644
--- a/sci-misc/elmer-post/metadata.xml
+++ b/sci-misc/elmer-post/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/finomaton/metadata.xml b/sci-misc/finomaton/metadata.xml
index cffbe2f..6bef805 100644
--- a/sci-misc/finomaton/metadata.xml
+++ b/sci-misc/finomaton/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
 </pkgmetadata>

diff --git a/sci-misc/fitscut/metadata.xml b/sci-misc/fitscut/metadata.xml
index 2bc77f7..cc63d59 100644
--- a/sci-misc/fitscut/metadata.xml
+++ b/sci-misc/fitscut/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>

diff --git a/sci-misc/foma/metadata.xml b/sci-misc/foma/metadata.xml
index cffbe2f..6bef805 100644
--- a/sci-misc/foma/metadata.xml
+++ b/sci-misc/foma/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
 </pkgmetadata>

diff --git a/sci-misc/irstlm/metadata.xml b/sci-misc/irstlm/metadata.xml
index e74038c..5e12fb7 100644
--- a/sci-misc/irstlm/metadata.xml
+++ b/sci-misc/irstlm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>pavel.a.denisov@gmail.com</email>
 	</maintainer>
 	<longdescription lang="en">

diff --git a/sci-misc/jwnl/metadata.xml b/sci-misc/jwnl/metadata.xml
index dc7c73e..a174167 100644
--- a/sci-misc/jwnl/metadata.xml
+++ b/sci-misc/jwnl/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-misc/kaldi/metadata.xml b/sci-misc/kaldi/metadata.xml
index bcf6567..fbed389 100644
--- a/sci-misc/kaldi/metadata.xml
+++ b/sci-misc/kaldi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>pavel.a.denisov@gmail.com</email>
     <name>Pavel Denisov</name>
   </maintainer>

diff --git a/sci-misc/kotus-sanalista/metadata.xml b/sci-misc/kotus-sanalista/metadata.xml
index 6279442..13fb08d 100644
--- a/sci-misc/kotus-sanalista/metadata.xml
+++ b/sci-misc/kotus-sanalista/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription lang="en">

diff --git a/sci-misc/mitlm/metadata.xml b/sci-misc/mitlm/metadata.xml
index a86d9fa..5e38f52 100644
--- a/sci-misc/mitlm/metadata.xml
+++ b/sci-misc/mitlm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>pavel.a.denisov@gmail.com</email>
   </maintainer>
   <longdescription lang="en">

diff --git a/sci-misc/nltk/metadata.xml b/sci-misc/nltk/metadata.xml
index 8cf6c1d..ef43021 100644
--- a/sci-misc/nltk/metadata.xml
+++ b/sci-misc/nltk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-misc/omorfi/metadata.xml b/sci-misc/omorfi/metadata.xml
index bc00177..bb7c08e 100644
--- a/sci-misc/omorfi/metadata.xml
+++ b/sci-misc/omorfi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription lang="en">

diff --git a/sci-misc/openfst/metadata.xml b/sci-misc/openfst/metadata.xml
index cffbe2f..6bef805 100644
--- a/sci-misc/openfst/metadata.xml
+++ b/sci-misc/openfst/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
 </pkgmetadata>

diff --git a/sci-misc/opennlp-maxent/metadata.xml b/sci-misc/opennlp-maxent/metadata.xml
index 74e1024..63d0002 100644
--- a/sci-misc/opennlp-maxent/metadata.xml
+++ b/sci-misc/opennlp-maxent/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-misc/praat/metadata.xml b/sci-misc/praat/metadata.xml
index c31cf65..1778e5f 100644
--- a/sci-misc/praat/metadata.xml
+++ b/sci-misc/praat/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription lang="en">

diff --git a/sci-misc/pywordnet/metadata.xml b/sci-misc/pywordnet/metadata.xml
index 41b4345..0c1d298 100644
--- a/sci-misc/pywordnet/metadata.xml
+++ b/sci-misc/pywordnet/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-misc/sfst/metadata.xml b/sci-misc/sfst/metadata.xml
index 1865e60..746d75b 100644
--- a/sci-misc/sfst/metadata.xml
+++ b/sci-misc/sfst/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
     <description>N.B. This is used in my master’s thesis project</description>
   </maintainer>

diff --git a/sci-misc/simx/metadata.xml b/sci-misc/simx/metadata.xml
index 5f898a7..2ceb14a 100644
--- a/sci-misc/simx/metadata.xml
+++ b/sci-misc/simx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-misc/stanford-parser/metadata.xml b/sci-misc/stanford-parser/metadata.xml
index e721375..c76e079 100644
--- a/sci-misc/stanford-parser/metadata.xml
+++ b/sci-misc/stanford-parser/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-misc/stanford-tagger/metadata.xml b/sci-misc/stanford-tagger/metadata.xml
index 95ef8b6..16c76b3 100644
--- a/sci-misc/stanford-tagger/metadata.xml
+++ b/sci-misc/stanford-tagger/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flammie@gentoo.org</email>
   </maintainer>
   <longdescription>

diff --git a/sci-physics/abinit/metadata.xml b/sci-physics/abinit/metadata.xml
index 5153d26..b204135 100644
--- a/sci-physics/abinit/metadata.xml
+++ b/sci-physics/abinit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/atompaw/metadata.xml b/sci-physics/atompaw/metadata.xml
index 51170ae..a071550 100644
--- a/sci-physics/atompaw/metadata.xml
+++ b/sci-physics/atompaw/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>

diff --git a/sci-physics/bigdft/metadata.xml b/sci-physics/bigdft/metadata.xml
index 9b5d450..a687c58 100644
--- a/sci-physics/bigdft/metadata.xml
+++ b/sci-physics/bigdft/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/elk/metadata.xml b/sci-physics/elk/metadata.xml
index b3f7822..9357a96 100644
--- a/sci-physics/elk/metadata.xml
+++ b/sci-physics/elk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index 0ab0e92..94152b1 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 27c676b..f4ead9e 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/fullprof-bin/metadata.xml b/sci-physics/fullprof-bin/metadata.xml
index a5511c0..4cf6b37 100644
--- a/sci-physics/fullprof-bin/metadata.xml
+++ b/sci-physics/fullprof-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marten@xtal.rwth-aachen.de</email>
     <name>Jan M. Simons</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>

diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant-vmc/metadata.xml
index 5f4686f..89ff88f 100644
--- a/sci-physics/geant-vmc/metadata.xml
+++ b/sci-physics/geant-vmc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/genfit/metadata.xml b/sci-physics/genfit/metadata.xml
index ecfb1e3..a9ebbe0 100644
--- a/sci-physics/genfit/metadata.xml
+++ b/sci-physics/genfit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index de552ff..8db6bd6 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>jauhien@gentoo.org</email>
 </maintainer>
-<maintainer>
+<maintainer type="project">
   <email>sci-physics@gentoo.org</email>
   <name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
index 7f551a0..9a862af 100644
--- a/sci-physics/hoomd-blue/metadata.xml
+++ b/sci-physics/hoomd-blue/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>

diff --git a/sci-physics/looptools/metadata.xml b/sci-physics/looptools/metadata.xml
index 5a1d6c9..4333af5 100644
--- a/sci-physics/looptools/metadata.xml
+++ b/sci-physics/looptools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-physics@gentoo.org</email>
 	<name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-physics/mc-tester/metadata.xml b/sci-physics/mc-tester/metadata.xml
index a55da09..69def48 100644
--- a/sci-physics/mc-tester/metadata.xml
+++ b/sci-physics/mc-tester/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>piatlicki@gmail.com</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/openmx/metadata.xml b/sci-physics/openmx/metadata.xml
index 0e16baf..ab9d7ec 100644
--- a/sci-physics/openmx/metadata.xml
+++ b/sci-physics/openmx/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-physics@gentoo.org</email>
 	<name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-physics/qcl/metadata.xml b/sci-physics/qcl/metadata.xml
index 8483e79..1e21750 100644
--- a/sci-physics/qcl/metadata.xml
+++ b/sci-physics/qcl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>A.G.Grozin@inp.nsk.su</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>

diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
index 2c58e14..532272a 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-physics@gentoo.org</email>
 	<name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 3bb2162..cbfb8dd 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/tauola/metadata.xml b/sci-physics/tauola/metadata.xml
index ce6d7bd..fe174bc 100644
--- a/sci-physics/tauola/metadata.xml
+++ b/sci-physics/tauola/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>piatlicki@gmail.com</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>

diff --git a/sci-physics/vgm/metadata.xml b/sci-physics/vgm/metadata.xml
index 2f4f05a..1806bf5 100644
--- a/sci-physics/vgm/metadata.xml
+++ b/sci-physics/vgm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-physics@gentoo.org</email>
   <name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml
index 7e22ef3..8075483 100644
--- a/sci-physics/yoda/metadata.xml
+++ b/sci-physics/yoda/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
   <email>sci-physics@gentoo.org</email>
   <name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/sci-visualization/forge/metadata.xml b/sci-visualization/forge/metadata.xml
index 8da27e1..48c30ca 100644
--- a/sci-visualization/forge/metadata.xml
+++ b/sci-visualization/forge/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 0c22e00..b6f49a5 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ulm@gentoo.org</email>
     <name>Ulrich Müller</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
index d03aecc..7335b8a 100644
--- a/sci-visualization/mantid/metadata.xml
+++ b/sci-visualization/mantid/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>cjk34@cam.ac.uk</email>
     <name>Chris Kerr</name>
     <description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml
index d5007a7..0bde729 100644
--- a/sci-visualization/mayavi/metadata.xml
+++ b/sci-visualization/mayavi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-visualization/nodemon/metadata.xml b/sci-visualization/nodemon/metadata.xml
index cc03d56..6c26516 100644
--- a/sci-visualization/nodemon/metadata.xml
+++ b/sci-visualization/nodemon/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>bryan.d.green@nasa.gov</email>
 		<name>Bryan Green</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-visualization/v_sim/metadata.xml b/sci-visualization/v_sim/metadata.xml
index 643171f..91195a1 100644
--- a/sci-visualization/v_sim/metadata.xml
+++ b/sci-visualization/v_sim/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>dongxuli2011@gmail.com</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sci-visualization/vtkPOFFReader/metadata.xml b/sci-visualization/vtkPOFFReader/metadata.xml
index 62b5fdc..960d2ff 100644
--- a/sci-visualization/vtkPOFFReader/metadata.xml
+++ b/sci-visualization/vtkPOFFReader/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sci-visualization/yt/metadata.xml b/sci-visualization/yt/metadata.xml
index c0a7922..bf8fc16 100644
--- a/sci-visualization/yt/metadata.xml
+++ b/sci-visualization/yt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sys-cluster/blcr/metadata.xml b/sys-cluster/blcr/metadata.xml
index 3c53aa7..bd6926b 100644
--- a/sys-cluster/blcr/metadata.xml
+++ b/sys-cluster/blcr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/empi/metadata.xml b/sys-cluster/empi/metadata.xml
index 8ca4443..1c68ec9 100644
--- a/sys-cluster/empi/metadata.xml
+++ b/sys-cluster/empi/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jsbronder@gentoo.org</email>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/ganglia_jobmonarch/metadata.xml b/sys-cluster/ganglia_jobmonarch/metadata.xml
index 5acd99b..f3834ba 100644
--- a/sys-cluster/ganglia_jobmonarch/metadata.xml
+++ b/sys-cluster/ganglia_jobmonarch/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/gasnet/metadata.xml b/sys-cluster/gasnet/metadata.xml
index 5ade5a0..3ffc9db 100644
--- a/sys-cluster/gasnet/metadata.xml
+++ b/sys-cluster/gasnet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index 1b6af8e..9b28d5e 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="unknown">
     <email>tantive@gentoo.org</email>
     <name>Michael Imhof</name>
     <description>Release manager, patch manager</description>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index b1ffc3b..2de86c1 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/metadata.xml
@@ -10,10 +10,10 @@
   currently, Linux based systems, such as SMP nodes and conventional
   clusters.
 </longdescription>
-  <maintainer>
+  <maintainer type="person">
     <email>gentryx@gmx.de</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/htcondor/metadata.xml b/sys-cluster/htcondor/metadata.xml
index 50e02c4..fd01a5e 100644
--- a/sys-cluster/htcondor/metadata.xml
+++ b/sys-cluster/htcondor/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>cjk34@cam.ac.uk</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 14166e8..1524fec 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/sys-cluster/lustre/metadata.xml b/sys-cluster/lustre/metadata.xml
index 0cd6c37..0e27fb0 100644
--- a/sys-cluster/lustre/metadata.xml
+++ b/sys-cluster/lustre/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/modules/metadata.xml b/sys-cluster/modules/metadata.xml
index be42707..93949be 100644
--- a/sys-cluster/modules/metadata.xml
+++ b/sys-cluster/modules/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>nicolasbock@gentoo.org</email>
     <name>Nicolas Bock</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
index d3fa019..8bf4b5f 100644
--- a/sys-cluster/mpe2/metadata.xml
+++ b/sys-cluster/mpe2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>

diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 8a8f0c3..6cbe440 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>balaji@mcs.anl.gov</email>
 		<name>Pavan Balaji</name>
 		<description>Upstream Contact</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>

diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 90eb214..3b1e638 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jsbronder@gentoo.org</email>
     <name>Justin Bronder</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>balaji@mcs.anl.gov</email>
     <name>Pavan Balaji</name>
     <description>Upstream Contact</description>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
index ec7db41..2c8285b 100644
--- a/sys-cluster/mvapich2/metadata.xml
+++ b/sys-cluster/mvapich2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/nullmpi/metadata.xml b/sys-cluster/nullmpi/metadata.xml
index 5ade5a0..3ffc9db 100644
--- a/sys-cluster/nullmpi/metadata.xml
+++ b/sys-cluster/nullmpi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 36690d3..214eab6 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jsbronder@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-cluster/ovis/metadata.xml b/sys-cluster/ovis/metadata.xml
index 2769a0d..63e032d 100644
--- a/sys-cluster/ovis/metadata.xml
+++ b/sys-cluster/ovis/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>andyspiros@gmail.com</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/sys-cluster/pyslice/metadata.xml b/sys-cluster/pyslice/metadata.xml
index 403d825..380503d 100644
--- a/sys-cluster/pyslice/metadata.xml
+++ b/sys-cluster/pyslice/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

diff --git a/sys-devel/gdebugger/metadata.xml b/sys-devel/gdebugger/metadata.xml
index 5dc698a..41bbd23 100644
--- a/sys-devel/gdebugger/metadata.xml
+++ b/sys-devel/gdebugger/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nbigaouette@gmail.com</email>
 		<name>Nicolas Bigaouette</name>
 	</maintainer>
-<maintainer>
+<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>

diff --git a/virtual/blacs/metadata.xml b/virtual/blacs/metadata.xml
index aec6063..3dbc782 100644
--- a/virtual/blacs/metadata.xml
+++ b/virtual/blacs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml
index 9c16367..55119ed 100644
--- a/virtual/blas/metadata.xml
+++ b/virtual/blas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/cblas/metadata.xml b/virtual/cblas/metadata.xml
index 7a37f98..2206cdb 100644
--- a/virtual/cblas/metadata.xml
+++ b/virtual/cblas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/geant/metadata.xml b/virtual/geant/metadata.xml
index 7198b38..bc35ac0 100644
--- a/virtual/geant/metadata.xml
+++ b/virtual/geant/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="project">
 	<email>sci-physics@gentoo.org</email>
 	<name>Gentoo Physics Project</name>
 </maintainer>

diff --git a/virtual/lapack/metadata.xml b/virtual/lapack/metadata.xml
index 1e47b27..35a73f5 100644
--- a/virtual/lapack/metadata.xml
+++ b/virtual/lapack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/lapacke/metadata.xml b/virtual/lapacke/metadata.xml
index 8d15e6d..f8d8b36 100644
--- a/virtual/lapacke/metadata.xml
+++ b/virtual/lapacke/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/mpi/metadata.xml b/virtual/mpi/metadata.xml
index 892427e..327f69e 100644
--- a/virtual/mpi/metadata.xml
+++ b/virtual/mpi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>

diff --git a/virtual/perl-encoding-warnings/metadata.xml b/virtual/perl-encoding-warnings/metadata.xml
index 721f543..8425c0d 100644
--- a/virtual/perl-encoding-warnings/metadata.xml
+++ b/virtual/perl-encoding-warnings/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/virtual/scalapack/metadata.xml b/virtual/scalapack/metadata.xml
index 8984187..6e02512 100644
--- a/virtual/scalapack/metadata.xml
+++ b/virtual/scalapack/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/www-client/casperjs/metadata.xml b/www-client/casperjs/metadata.xml
index fc7ace6..3a70916 100644
--- a/www-client/casperjs/metadata.xml
+++ b/www-client/casperjs/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml
index 7d09cea..0497e0e 100644
--- a/x11-libs/agg/metadata.xml
+++ b/x11-libs/agg/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/x11-libs/tr/metadata.xml b/x11-libs/tr/metadata.xml
index 721f543..8425c0d 100644
--- a/x11-libs/tr/metadata.xml
+++ b/x11-libs/tr/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/x11-libs/xview-bin/metadata.xml b/x11-libs/xview-bin/metadata.xml
index aa9aed4..fc33570 100644
--- a/x11-libs/xview-bin/metadata.xml
+++ b/x11-libs/xview-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index aa9aed4..fc33570 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
-<maintainer>
+<maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>

diff --git a/x11-misc/envytools/metadata.xml b/x11-misc/envytools/metadata.xml
index 76100f3..8567914 100644
--- a/x11-misc/envytools/metadata.xml
+++ b/x11-misc/envytools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alexxy@gentoo.org</email>
     <name>Alexey Shvetsov</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>


^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2016-01-25  8:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-25  8:53 [gentoo-commits] proj/sci:master commit in: dev-perl/Lab-VISA/, sci-biology/aghermann/, sci-libs/armadillo/, Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox