summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/aap/metadata.xml5
-rw-r--r--dev-util/ald/metadata.xml1
-rw-r--r--dev-util/anjuta/metadata.xml5
-rw-r--r--dev-util/antlrworks/metadata.xml5
-rw-r--r--dev-util/appdata-tools/metadata.xml5
-rw-r--r--dev-util/appinventor/metadata.xml5
-rw-r--r--dev-util/argouml/metadata.xml5
-rw-r--r--dev-util/astyle/metadata.xml1
-rw-r--r--dev-util/automoc/metadata.xml5
-rw-r--r--dev-util/autoproject/metadata.xml5
-rw-r--r--dev-util/bakefile/metadata.xml5
-rw-r--r--dev-util/bdelta/metadata.xml5
-rw-r--r--dev-util/bitcoin-tx/metadata.xml5
-rw-r--r--dev-util/bnfc/metadata.xml5
-rw-r--r--dev-util/boost-build/metadata.xml5
-rw-r--r--dev-util/btyacc/metadata.xml5
-rw-r--r--dev-util/bumpversion/metadata.xml5
-rw-r--r--dev-util/bustle/metadata.xml5
-rw-r--r--dev-util/catalyst/metadata.xml5
-rw-r--r--dev-util/catfish/metadata.xml5
-rw-r--r--dev-util/catkin/metadata.xml5
-rw-r--r--dev-util/ccache/metadata.xml5
-rw-r--r--dev-util/ccglue/metadata.xml5
-rw-r--r--dev-util/cdiff/metadata.xml1
-rw-r--r--dev-util/cgdb/metadata.xml1
-rw-r--r--dev-util/checkbashisms/metadata.xml5
-rw-r--r--dev-util/checkstyle/metadata.xml5
-rw-r--r--dev-util/cmake/metadata.xml5
-rw-r--r--dev-util/cmocka/metadata.xml5
-rw-r--r--dev-util/coccinelle/metadata.xml5
-rw-r--r--dev-util/codeblocks/metadata.xml5
-rw-r--r--dev-util/colorgcc/metadata.xml5
-rw-r--r--dev-util/cppunit/metadata.xml5
-rw-r--r--dev-util/cpuinfo-collection/metadata.xml5
-rw-r--r--dev-util/cscope/metadata.xml10
-rw-r--r--dev-util/csup/metadata.xml5
-rw-r--r--dev-util/ctags/metadata.xml5
-rw-r--r--dev-util/cunit/metadata.xml1
-rw-r--r--dev-util/cyclo/metadata.xml1
-rw-r--r--dev-util/d-feet/metadata.xml5
-rw-r--r--dev-util/dbus-test-runner/metadata.xml5
-rw-r--r--dev-util/debhelper/metadata.xml5
-rw-r--r--dev-util/debootstrap/metadata.xml5
-rw-r--r--dev-util/debugedit/metadata.xml5
-rw-r--r--dev-util/dejagnu/metadata.xml5
-rw-r--r--dev-util/desktop-file-utils/metadata.xml1
-rw-r--r--dev-util/deskzilla/metadata.xml5
-rw-r--r--dev-util/devhelp/metadata.xml5
-rw-r--r--dev-util/dialog/metadata.xml5
-rw-r--r--dev-util/diffstat/metadata.xml5
-rw-r--r--dev-util/dogtail/metadata.xml5
-rw-r--r--dev-util/duma/metadata.xml1
-rw-r--r--dev-util/eclipse-sdk/metadata.xml5
-rw-r--r--dev-util/elfkickers/metadata.xml5
-rw-r--r--dev-util/eric/metadata.xml5
-rw-r--r--dev-util/febootstrap/metadata.xml5
-rw-r--r--dev-util/fhist/metadata.xml5
-rw-r--r--dev-util/findbugs/metadata.xml5
-rw-r--r--dev-util/fix-la-relink-command/metadata.xml5
-rw-r--r--dev-util/gdbus-codegen/metadata.xml5
-rw-r--r--dev-util/glade/metadata.xml5
-rw-r--r--dev-util/global/metadata.xml5
-rw-r--r--dev-util/gnome-devel-docs/metadata.xml5
-rw-r--r--dev-util/gob/metadata.xml5
-rw-r--r--dev-util/gource/metadata.xml5
-rw-r--r--dev-util/gquilt/metadata.xml1
-rw-r--r--dev-util/gtk-builder-convert/metadata.xml5
-rw-r--r--dev-util/gtk-doc-am/metadata.xml5
-rw-r--r--dev-util/gtk-doc/metadata.xml5
-rw-r--r--dev-util/gtk-update-icon-cache/metadata.xml5
-rw-r--r--dev-util/hxtools/metadata.xml5
-rw-r--r--dev-util/icemon/metadata.xml10
-rw-r--r--dev-util/idea-ultimate/metadata.xml7
-rw-r--r--dev-util/insight/metadata.xml1
-rw-r--r--dev-util/intltool/metadata.xml1
-rw-r--r--dev-util/itstool/metadata.xml5
-rw-r--r--dev-util/jarwizard/metadata.xml5
-rw-r--r--dev-util/jay/metadata.xml10
-rw-r--r--dev-util/jconfig/metadata.xml5
-rw-r--r--dev-util/kbuild/metadata.xml5
-rw-r--r--dev-util/kdbg/metadata.xml5
-rw-r--r--dev-util/kdevelop-pg-qt/metadata.xml5
-rw-r--r--dev-util/kdevelop-php-docs/metadata.xml5
-rw-r--r--dev-util/kdevelop-php/metadata.xml5
-rw-r--r--dev-util/kdevelop-python/metadata.xml5
-rw-r--r--dev-util/kdevelop-qmake/metadata.xml5
-rw-r--r--dev-util/kdevelop-qmljs/metadata.xml5
-rw-r--r--dev-util/kdevelop/metadata.xml5
-rw-r--r--dev-util/kdevplatform/metadata.xml5
-rw-r--r--dev-util/kscope/metadata.xml5
-rw-r--r--dev-util/lcov/metadata.xml1
-rw-r--r--dev-util/leaktracer/metadata.xml5
-rw-r--r--dev-util/ltrace/metadata.xml1
-rw-r--r--dev-util/makepp/metadata.xml5
-rw-r--r--dev-util/mdds/metadata.xml5
-rw-r--r--dev-util/meld/metadata.xml5
-rw-r--r--dev-util/mingw-runtime/metadata.xml5
-rw-r--r--dev-util/mingw64-runtime/metadata.xml5
-rw-r--r--dev-util/monkeystudio/metadata.xml5
-rw-r--r--dev-util/mono-debugger/metadata.xml5
-rw-r--r--dev-util/monodevelop-database/metadata.xml5
-rw-r--r--dev-util/monodevelop-debugger-gdb/metadata.xml5
-rw-r--r--dev-util/monodevelop/metadata.xml5
-rw-r--r--dev-util/nemiver/metadata.xml5
-rw-r--r--dev-util/netbeans/metadata.xml5
-rw-r--r--dev-util/ninja-ide/metadata.xml5
-rw-r--r--dev-util/ninja/metadata.xml5
-rw-r--r--dev-util/nvidia-cuda-sdk/metadata.xml5
-rw-r--r--dev-util/nvidia-cuda-toolkit/metadata.xml5
-rw-r--r--dev-util/obs-service-cpanspec/metadata.xml5
-rw-r--r--dev-util/obs-service-download_files/metadata.xml5
-rw-r--r--dev-util/obs-service-download_src_package/metadata.xml5
-rw-r--r--dev-util/obs-service-download_url/metadata.xml5
-rw-r--r--dev-util/obs-service-extract_file/metadata.xml5
-rw-r--r--dev-util/obs-service-format_spec_file/metadata.xml5
-rw-r--r--dev-util/obs-service-generator_driver_update_disk/metadata.xml5
-rw-r--r--dev-util/obs-service-git_tarballs/metadata.xml5
-rw-r--r--dev-util/obs-service-github_tarballs/metadata.xml5
-rw-r--r--dev-util/obs-service-meta/metadata.xml5
-rw-r--r--dev-util/obs-service-rearchive/metadata.xml5
-rw-r--r--dev-util/obs-service-recompress/metadata.xml5
-rw-r--r--dev-util/obs-service-set_version/metadata.xml5
-rw-r--r--dev-util/obs-service-source_validator/metadata.xml5
-rw-r--r--dev-util/obs-service-tar_scm/metadata.xml5
-rw-r--r--dev-util/obs-service-update_source/metadata.xml5
-rw-r--r--dev-util/obs-service-verify_file/metadata.xml5
-rw-r--r--dev-util/omake/metadata.xml5
-rw-r--r--dev-util/osc/metadata.xml5
-rw-r--r--dev-util/patchutils/metadata.xml7
-rw-r--r--dev-util/pida/metadata.xml5
-rw-r--r--dev-util/pkgconf/metadata.xml5
-rw-r--r--dev-util/pkgconfig/metadata.xml1
-rw-r--r--dev-util/plan9port/metadata.xml5
-rw-r--r--dev-util/pmd/metadata.xml5
-rw-r--r--dev-util/qbs/metadata.xml5
-rw-r--r--dev-util/qstlink2/metadata.xml5
-rw-r--r--dev-util/quilt/metadata.xml6
-rw-r--r--dev-util/rbtools/metadata.xml5
-rw-r--r--dev-util/rebar/metadata.xml5
-rw-r--r--dev-util/regexxer/metadata.xml5
-rw-r--r--dev-util/rosdep/metadata.xml5
-rw-r--r--dev-util/rosinstall/metadata.xml5
-rw-r--r--dev-util/rosinstall_generator/metadata.xml5
-rw-r--r--dev-util/scala-ide/metadata.xml5
-rw-r--r--dev-util/scons/metadata.xml5
-rw-r--r--dev-util/setconf/metadata.xml10
-rw-r--r--dev-util/shellcheck/metadata.xml1
-rw-r--r--dev-util/shelltestrunner/metadata.xml5
-rw-r--r--dev-util/shflags/metadata.xml5
-rw-r--r--dev-util/shtool/metadata.xml1
-rw-r--r--dev-util/skipfish/metadata.xml5
-rw-r--r--dev-util/spec-cleaner/metadata.xml5
-rw-r--r--dev-util/strace/metadata.xml5
-rw-r--r--dev-util/suse-build/metadata.xml5
-rw-r--r--dev-util/tailor/metadata.xml5
-rw-r--r--dev-util/tkdiff/metadata.xml5
-rw-r--r--dev-util/treecc/metadata.xml5
-rw-r--r--dev-util/txt2regex/metadata.xml5
-rw-r--r--dev-util/unifdef/metadata.xml5
-rw-r--r--dev-util/universalindentgui/metadata.xml5
-rw-r--r--dev-util/vdkbuilder/metadata.xml1
-rw-r--r--dev-util/visual-regexp/metadata.xml5
-rw-r--r--dev-util/visualvm/metadata.xml5
-rw-r--r--dev-util/w32api/metadata.xml5
-rw-r--r--dev-util/watchr/metadata.xml5
-rw-r--r--dev-util/webstorm/metadata.xml5
-rw-r--r--dev-util/weka/metadata.xml5
-rw-r--r--dev-util/wstool/metadata.xml5
-rw-r--r--dev-util/wxglade/metadata.xml5
-rw-r--r--dev-util/xmlindent/metadata.xml1
-rw-r--r--dev-util/xxdiff/metadata.xml5
-rw-r--r--dev-util/yuicompressor/metadata.xml5
172 files changed, 634 insertions, 179 deletions
diff --git a/dev-util/aap/metadata.xml b/dev-util/aap/metadata.xml
index efa518256292..574fdc0e717f 100644
--- a/dev-util/aap/metadata.xml
+++ b/dev-util/aap/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">a-a-p</remote-id>
</upstream>
diff --git a/dev-util/ald/metadata.xml b/dev-util/ald/metadata.xml
index 2b6fbc1053e9..7d70ee2eff74 100644
--- a/dev-util/ald/metadata.xml
+++ b/dev-util/ald/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<upstream>
<remote-id type="sourceforge">ald</remote-id>
</upstream>
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 32ad5a24d818..d9b33c23953b 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="devhelp">Enable devhelp integration</flag>
<flag name="glade">Build glade plugin for anjuta</flag>
diff --git a/dev-util/antlrworks/metadata.xml b/dev-util/antlrworks/metadata.xml
index 3ae83fc7830c..83a85cf5a7b6 100644
--- a/dev-util/antlrworks/metadata.xml
+++ b/dev-util/antlrworks/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription lang="en">
ANTLRWorks is a novel grammar development environment for ANTLR v3
grammars written by Jean Bovet (with suggested use cases from
diff --git a/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
index 6eb354a7ef11..92e0eb587821 100644
--- a/dev-util/appdata-tools/metadata.xml
+++ b/dev-util/appdata-tools/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">hughsie/appdata-tools</remote-id>
</upstream>
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index 6a67278ded8a..a7911192c19a 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>gentoo.power@gmail.com</email>
<name>Iván Atienza</name>
@@ -12,6 +11,10 @@
<name>Markos Chandras</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/dev-util/argouml/metadata.xml b/dev-util/argouml/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-util/argouml/metadata.xml
+++ b/dev-util/argouml/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index 3ed3c4b22b24..c08bb1e8524b 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<longdescription>
From the web page:
diff --git a/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/automoc/metadata.xml
+++ b/dev-util/automoc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/autoproject/metadata.xml
+++ b/dev-util/autoproject/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
index c1a4dd3eb2e0..b059a78e4572 100644
--- a/dev-util/bakefile/metadata.xml
+++ b/dev-util/bakefile/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>wxwidgets</herd>
+ <maintainer>
+ <email>wxwidgets@gentoo.org</email>
+ <name>Gentoo wxWidgets Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">bakefile</remote-id>
</upstream>
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
index 6b82cf0d48fc..ab05a5144206 100644
--- a/dev-util/bdelta/metadata.xml
+++ b/dev-util/bdelta/metadata.xml
@@ -6,7 +6,10 @@
<name>Sergei Trofimovich</name>
<description>Primary Maintainer</description>
</maintainer>
- <herd>tools-portage</herd>
+ <maintainer>
+ <email>tools-portage@gentoo.org</email>
+ <name>Gentoo Portage tools team</name>
+ </maintainer>
<upstream>
<remote-id type="github">jjwhitney/BDelta</remote-id>
</upstream>
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index e188f3384bcf..237c631767c5 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">bitcoin/bitcoin</remote-id>
</upstream>
diff --git a/dev-util/bnfc/metadata.xml b/dev-util/bnfc/metadata.xml
index ddb2b453cd1f..320f819da1e3 100644
--- a/dev-util/bnfc/metadata.xml
+++ b/dev-util/bnfc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
+ <maintainer>
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 031ebfc77646..914846767c7a 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">boost</remote-id>
</upstream>
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
index 432f6bd7e831..b217ca6048ca 100644
--- a/dev-util/btyacc/metadata.xml
+++ b/dev-util/btyacc/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
@@ -12,4 +11,8 @@
<name>William L. Thomson Jr.</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml
index cbc386e5a915..e4af3d007663 100644
--- a/dev-util/bumpversion/metadata.xml
+++ b/dev-util/bumpversion/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">bumpversion</remote-id>
<remote-id type="github">peritus/bumpversion</remote-id>
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index d2e02d93825d..a7a50120b4b9 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
+ <maintainer>
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
<longdescription>
Draw pretty sequence diagrams of D-Bus traffic
</longdescription>
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 918f25d2e093..06b9dcb5bd38 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>livecd</herd>
<maintainer>
<email>catalyst@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+ </maintainer>
<use>
<flag name="ccache">Enables ccache support</flag>
</use>
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index c1dcc264f34f..56cbdd9604a5 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">catfish-search</remote-id>
</upstream>
diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml
index 4534eeb6a439..b839bb98e582 100644
--- a/dev-util/catkin/metadata.xml
+++ b/dev-util/catkin/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ros/catkin</remote-id>
</upstream>
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index a1113ba3300a..e245a1647c0f 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>toolchain</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<longdescription lang="en">
ccache acts as a caching pre-processor to C/C++ compilers, improving
compilation time when recompiling previously compiled source.
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
index 53a503e1fe5d..d05ffb595b8d 100644
--- a/dev-util/ccglue/metadata.xml
+++ b/dev-util/ccglue/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
<longdescription lang="en">
ccglue (ctags-cscope glue) is intended to be the interfacing app between cscope
and ctags. It can generate cross-reference tag files that can be interfaced
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index 29c3432a8d76..eb47fa951d52 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<longdescription>
Colored, side-by-side diff terminal viewer.
</longdescription>
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index cb772e568728..bdcc034da2f9 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<upstream>
<remote-id type="sourceforge">cgdb</remote-id>
</upstream>
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
index 3ca88ad73f31..c02c04449e94 100644
--- a/dev-util/checkbashisms/metadata.xml
+++ b/dev-util/checkbashisms/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">checkbaskisms</remote-id>
</upstream>
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
index 0a63c3f4568f..05187eb3c576 100644
--- a/dev-util/checkstyle/metadata.xml
+++ b/dev-util/checkstyle/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">checkstyle</remote-id>
<remote-id type="github">checkstyle/checkstyle</remote-id>
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 7e3fec5ae431..3ff2291a419f 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
</use>
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
index f017c1146cff..fe25c1aec0a6 100644
--- a/dev-util/cmocka/metadata.xml
+++ b/dev-util/cmocka/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
<maintainer>
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
index 06d54062e2f2..b1f11ebb7b36 100644
--- a/dev-util/coccinelle/metadata.xml
+++ b/dev-util/coccinelle/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
<maintainer>
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 0f3a706d7ab7..3eb9da8e9751 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>wxwidgets</herd>
+ <maintainer>
+ <email>wxwidgets@gentoo.org</email>
+ <name>Gentoo wxWidgets Project</name>
+ </maintainer>
<use>
<flag name="contrib">Build additional contrib components</flag>
</use>
diff --git a/dev-util/colorgcc/metadata.xml b/dev-util/colorgcc/metadata.xml
index 40149c995561..32cb706ccf75 100644
--- a/dev-util/colorgcc/metadata.xml
+++ b/dev-util/colorgcc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-util/cppunit/metadata.xml
+++ b/dev-util/cppunit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/cpuinfo-collection/metadata.xml b/dev-util/cpuinfo-collection/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/cpuinfo-collection/metadata.xml
+++ b/dev-util/cpuinfo-collection/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/cscope/metadata.xml b/dev-util/cscope/metadata.xml
index 434721ed1a1c..6c0e2937ad0d 100644
--- a/dev-util/cscope/metadata.xml
+++ b/dev-util/cscope/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>vim</herd>
- <herd>emacs</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+ </maintainer>
<longdescription>
Cscope is a developer's tool for browsing source code. Cscope allows
searching code for:
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/dev-util/csup/metadata.xml
+++ b/dev-util/csup/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 4306b7903053..4095bc5de56a 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>vim</herd>
+ <maintainer>
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
<use>
<flag name="ada">Enable Ada support</flag>
</use>
diff --git a/dev-util/cunit/metadata.xml b/dev-util/cunit/metadata.xml
index 875d63833a63..bb77d7c3aa34 100644
--- a/dev-util/cunit/metadata.xml
+++ b/dev-util/cunit/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>lang-misc</herd>
<upstream>
<remote-id type="sourceforge">cunit</remote-id>
</upstream>
diff --git a/dev-util/cyclo/metadata.xml b/dev-util/cyclo/metadata.xml
index 44729c62a7ad..232c11960257 100644
--- a/dev-util/cyclo/metadata.xml
+++ b/dev-util/cyclo/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>dev-tools</herd>
<maintainer>
<email>nerdboy@gentoo.org</email>
<name>Steve Arnold</name>
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
index 9dac5c8a2bd2..3ab299ddfa6c 100644
--- a/dev-util/d-feet/metadata.xml
+++ b/dev-util/d-feet/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
<maintainer>
<email>cardoe@gentoo.org</email>
<name>Doug Goldstein</name>
<description>Feel free to bump or do any updates as needed</description>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/dbus-test-runner/metadata.xml b/dev-util/dbus-test-runner/metadata.xml
index 19dcdd8183d2..4a660105b008 100644
--- a/dev-util/dbus-test-runner/metadata.xml
+++ b/dev-util/dbus-test-runner/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">dbus-test-runner</remote-id>
</upstream>
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
index 13183a3d7070..858d11e5074a 100644
--- a/dev-util/debhelper/metadata.xml
+++ b/dev-util/debhelper/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>deb-tools</herd>
+<maintainer>
+ <email>deb-tools@gentoo.org</email>
+ <name>Gentoo Debian Tools Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index d5fca454db1f..a234812e7184 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>deb-tools</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+ <email>deb-tools@gentoo.org</email>
+ <name>Gentoo Debian Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/debugedit/metadata.xml
+++ b/dev-util/debugedit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
index fb4199eb7afe..c04b07f54613 100644
--- a/dev-util/dejagnu/metadata.xml
+++ b/dev-util/dejagnu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>toolchain</herd>
+<maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/desktop-file-utils/metadata.xml b/dev-util/desktop-file-utils/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/dev-util/desktop-file-utils/metadata.xml
+++ b/dev-util/desktop-file-utils/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/dev-util/deskzilla/metadata.xml
+++ b/dev-util/deskzilla/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml
index 2bbccce04951..851334fc91f7 100644
--- a/dev-util/devhelp/metadata.xml
+++ b/dev-util/devhelp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="gedit">Install plugin for <pkg>app-editors/gedit</pkg></flag>
</use>
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index a56bb3ac4585..e8c7e9d7978f 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+<email>livecd@gentoo.org</email>
+<name>Gentoo LiveCD Project</name>
+</maintainer>
<use>
<flag name="minimal">Disable library, install command-line program only</flag>
</use>
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
index 2d5b39853545..74be441f3aa3 100644
--- a/dev-util/diffstat/metadata.xml
+++ b/dev-util/diffstat/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<changelog>http://invisible-island.net/diffstat/CHANGES</changelog>
</upstream>
diff --git a/dev-util/dogtail/metadata.xml b/dev-util/dogtail/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/dev-util/dogtail/metadata.xml
+++ b/dev-util/dogtail/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/duma/metadata.xml b/dev-util/duma/metadata.xml
index 38964f6cb5a5..7db47aeaeee9 100644
--- a/dev-util/duma/metadata.xml
+++ b/dev-util/duma/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<longdescription>
DUMA is an open-source library (under GNU General Public License) to
detect buffer overruns and under-runs in C and C++ programs. This
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
index 83b1cb59b4e4..56c0e5a80abf 100644
--- a/dev-util/eclipse-sdk/metadata.xml
+++ b/dev-util/eclipse-sdk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription>
The Eclipse Project is an open source project of eclipse.org, overseen by
a Project Management Committee (PMC) and project leaders. The work is done
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
index d3cf0833c4dd..542dca119f9c 100644
--- a/dev-util/elfkickers/metadata.xml
+++ b/dev-util/elfkickers/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>hardened</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
<description>Primary Maintainer</description>
</maintainer>
+ <maintainer>
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
</pkgmetadata>
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
index 0b863c387a3e..32512589c7d2 100644
--- a/dev-util/eric/metadata.xml
+++ b/dev-util/eric/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">eric-ide</remote-id>
</upstream>
diff --git a/dev-util/febootstrap/metadata.xml b/dev-util/febootstrap/metadata.xml
index d62d48a3f6df..cb7717104532 100644
--- a/dev-util/febootstrap/metadata.xml
+++ b/dev-util/febootstrap/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
@@ -9,4 +8,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
index d575582d205e..4ee1c17916a8 100644
--- a/dev-util/fhist/metadata.xml
+++ b/dev-util/fhist/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fhist</remote-id>
</upstream>
diff --git a/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml
index 66ae673b690e..549e98606b54 100644
--- a/dev-util/findbugs/metadata.xml
+++ b/dev-util/findbugs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription>FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. Static analysis means that FindBugs can find bugs by simply inspecting a program's code: executing the program is not necessary. This makes FindBugs very easy to use: in general, you should be able to use it to look for bugs in your code within a few minutes of downloading it. FindBugs works by analyzing Java bytecode (compiled class files), so you don't even need the program's source code to use it. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is less than 50%.</longdescription>
<upstream>
<remote-id type="sourceforge">findbugs</remote-id>
diff --git a/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
index 7aa4c63325e2..88616e61d223 100644
--- a/dev-util/fix-la-relink-command/metadata.xml
+++ b/dev-util/fix-la-relink-command/metadata.xml
@@ -5,5 +5,8 @@
<email>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
-<herd>gnome</herd>
+<maintainer>
+<email>gnome@gentoo.org</email>
+<name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index 429c6105e4c5..d9adb36c4ec8 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
@@ -9,6 +8,10 @@
<email>arfrever.fta@gmail.com</email>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
</use>
diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gnome-devel-docs/metadata.xml
+++ b/dev-util/gnome-devel-docs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/gob/metadata.xml b/dev-util/gob/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gob/metadata.xml
+++ b/dev-util/gob/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
index 7775c15af392..7acee17029ef 100644
--- a/dev-util/gource/metadata.xml
+++ b/dev-util/gource/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>enrico.tagliavini@gmail.com</email>
<name>Enrico Tagliavini</name>
@@ -10,6 +9,10 @@
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">gource</remote-id>
<remote-id type="github">acaudwell/Gource</remote-id>
diff --git a/dev-util/gquilt/metadata.xml b/dev-util/gquilt/metadata.xml
index 3d6d79c9f3b8..782de34db8cf 100644
--- a/dev-util/gquilt/metadata.xml
+++ b/dev-util/gquilt/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<upstream>
<remote-id type="sourceforge">gquilt</remote-id>
</upstream>
diff --git a/dev-util/gtk-builder-convert/metadata.xml b/dev-util/gtk-builder-convert/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gtk-builder-convert/metadata.xml
+++ b/dev-util/gtk-builder-convert/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/gtk-doc-am/metadata.xml
+++ b/dev-util/gtk-doc-am/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
index a562fd84b87c..5ef9b83fa46c 100644
--- a/dev-util/gtk-doc/metadata.xml
+++ b/dev-util/gtk-doc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="highlight">Enable source code highlighting</flag>
<flag name="vim">Enable source code highlighting through
diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
index 23586bff0bd6..249756658a76 100644
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ b/dev-util/gtk-update-icon-cache/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
gtk-update-icon-cache is a tool from GTK+ to update icons and themes
caches.
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 6fffb6812f9a..7b3677c1caee 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
index e09a4ea6ca94..2671205a8eb9 100644
--- a/dev-util/icemon/metadata.xml
+++ b/dev-util/icemon/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cluster</herd>
-<herd>suse</herd>
+<maintainer>
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+</maintainer>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
index e787117837fa..9a75c1c3a23f 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
- <maintainer>
+<maintainer>
<email>gert@gepe-biljarts.be</email>
<name>Gert Pellin</name>
<description>Proxy maintainer. Assign bugs to him.</description>
@@ -11,6 +10,10 @@
<email>tomboy64@sina.cn</email>
<description>Proxied co-maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
</longdescription>
diff --git a/dev-util/insight/metadata.xml b/dev-util/insight/metadata.xml
index 392e8535ccce..150b1a474bb7 100644
--- a/dev-util/insight/metadata.xml
+++ b/dev-util/insight/metadata.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>dev-tools</herd>
<longdescription>Graphical front-end to GDB</longdescription>
</pkgmetadata>
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
index ab11cfdf2c80..a554fc85968c 100644
--- a/dev-util/intltool/metadata.xml
+++ b/dev-util/intltool/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
index dcf8006540cb..c5b83f7892b5 100644
--- a/dev-util/itstool/metadata.xml
+++ b/dev-util/itstool/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">ITS Tool allows you to translate your XML documents
with gettext PO files, using rules from the W3C Internationalization Tag Set
(ITS) to determine what to translate and how to separate it into PO file
diff --git a/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
index 1613b38b18cb..4902ef5f66c5 100644
--- a/dev-util/jarwizard/metadata.xml
+++ b/dev-util/jarwizard/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jarwizard</remote-id>
</upstream>
diff --git a/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
index 331dbe87a1f3..b526ceb67593 100644
--- a/dev-util/jay/metadata.xml
+++ b/dev-util/jay/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<herd>dotnet</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+<maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
index 3eb786ee584c..7866b51afe58 100644
--- a/dev-util/jconfig/metadata.xml
+++ b/dev-util/jconfig/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jconfig</remote-id>
</upstream>
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index 365af956a76a..c5788ae58783 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>swapon@gmail.com</email>
<name>Alessio Cassibba</name>
@@ -10,4 +9,8 @@
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdbg/metadata.xml b/dev-util/kdbg/metadata.xml
index 82cdedc036ae..85453ce615a7 100644
--- a/dev-util/kdbg/metadata.xml
+++ b/dev-util/kdbg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kdbg</remote-id>
</upstream>
diff --git a/dev-util/kdevelop-pg-qt/metadata.xml b/dev-util/kdevelop-pg-qt/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-pg-qt/metadata.xml
+++ b/dev-util/kdevelop-pg-qt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdevelop-php-docs/metadata.xml b/dev-util/kdevelop-php-docs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-php-docs/metadata.xml
+++ b/dev-util/kdevelop-php-docs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdevelop-php/metadata.xml b/dev-util/kdevelop-php/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-php/metadata.xml
+++ b/dev-util/kdevelop-php/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-python/metadata.xml
+++ b/dev-util/kdevelop-python/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdevelop-qmake/metadata.xml b/dev-util/kdevelop-qmake/metadata.xml
index 5a8fd6011702..a8c8aa529a5b 100644
--- a/dev-util/kdevelop-qmake/metadata.xml
+++ b/dev-util/kdevelop-qmake/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="tools">Build and install the qmake-parser debugging tool</flag>
</use>
diff --git a/dev-util/kdevelop-qmljs/metadata.xml b/dev-util/kdevelop-qmljs/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/kdevelop-qmljs/metadata.xml
+++ b/dev-util/kdevelop-qmljs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index d6717c393ca4..30c6eb413e4e 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="cmake">Enable support for CMake build system</flag>
<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
index 6acfb42b2ac0..bc0263a63550 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="classbrowser">Enable the class browser plugin</flag>
<flag name="konsole">Enable <pkg>kde-apps/konsole</pkg> integration</flag>
diff --git a/dev-util/kscope/metadata.xml b/dev-util/kscope/metadata.xml
index 1857d0bcc627..f3e450315124 100644
--- a/dev-util/kscope/metadata.xml
+++ b/dev-util/kscope/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kscope</remote-id>
</upstream>
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index a38465452764..8eb1e79ba8a3 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<upstream>
<remote-id type="sourceforge">ltp</remote-id>
</upstream>
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
index 8434377a6047..f7aaafedf146 100644
--- a/dev-util/leaktracer/metadata.xml
+++ b/dev-util/leaktracer/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cpp</herd>
+<maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
index dce9e2ed8fa4..dabd15d72dbd 100644
--- a/dev-util/ltrace/metadata.xml
+++ b/dev-util/ltrace/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<use>
<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
</use>
diff --git a/dev-util/makepp/metadata.xml b/dev-util/makepp/metadata.xml
index a575b05d4cca..7173de71c333 100644
--- a/dev-util/makepp/metadata.xml
+++ b/dev-util/makepp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">makepp</remote-id>
</upstream>
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 006f35bb0ba6..07a21f283ace 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">multidimalgorithm</remote-id>
</upstream>
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/dev-util/meld/metadata.xml
+++ b/dev-util/meld/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
index a4d63710b914..957427e97ceb 100644
--- a/dev-util/mingw-runtime/metadata.xml
+++ b/dev-util/mingw-runtime/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mingw</remote-id>
</upstream>
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index b6f2f9e194ac..30cad3a48acc 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<use>
<flag name="idl">
Install idl files.
diff --git a/dev-util/monkeystudio/metadata.xml b/dev-util/monkeystudio/metadata.xml
index 79f13541af69..96efff06bb5f 100644
--- a/dev-util/monkeystudio/metadata.xml
+++ b/dev-util/monkeystudio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<use>
<flag name="plugins">Build and install additional plugins</flag>
</use>
diff --git a/dev-util/mono-debugger/metadata.xml b/dev-util/mono-debugger/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/mono-debugger/metadata.xml
+++ b/dev-util/mono-debugger/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/monodevelop-database/metadata.xml b/dev-util/monodevelop-database/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/monodevelop-database/metadata.xml
+++ b/dev-util/monodevelop-database/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/monodevelop-debugger-gdb/metadata.xml b/dev-util/monodevelop-debugger-gdb/metadata.xml
index d35e9300c540..b578be7f7b36 100644
--- a/dev-util/monodevelop-debugger-gdb/metadata.xml
+++ b/dev-util/monodevelop-debugger-gdb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/monodevelop/metadata.xml b/dev-util/monodevelop/metadata.xml
index 14be1b1de2e2..1d225a3d48e8 100644
--- a/dev-util/monodevelop/metadata.xml
+++ b/dev-util/monodevelop/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
<use>
<flag name="git">Enable Git version control support</flag>
<flag name="gnome">Enable support gnome support (unsetting this flag is unsupported)</flag>
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index 10a2f1810a2e..eb9ad3b47a4e 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>
Nemiver is an on going effort to write an easy to use standalone C/C++
debugger that integrates well in the GNOME environment.
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
index f8a80571336f..20596a306b96 100644
--- a/dev-util/netbeans/metadata.xml
+++ b/dev-util/netbeans/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
<maintainer>
<email>fordfrog@gentoo.org</email>
<name>Miroslav Šulc</name>
</maintainer>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription>
NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
diff --git a/dev-util/ninja-ide/metadata.xml b/dev-util/ninja-ide/metadata.xml
index 021c8cade6ca..292f7ff1b689 100644
--- a/dev-util/ninja-ide/metadata.xml
+++ b/dev-util/ninja-ide/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
<name>Aaron Burnett</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<changelog>https://github.com/ninja-ide/ninja-ide/commits/master</changelog>
<doc lang="en">https://github.com/ninja-ide/ninja-ide/wiki</doc>
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
index d0d2e6d9f0f4..a9eaca4f8eb1 100644
--- a/dev-util/ninja/metadata.xml
+++ b/dev-util/ninja/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>chromium</herd>
+ <maintainer>
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">martine/ninja</remote-id>
</upstream>
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 8bd8dab6f976..499ed98be6a7 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<use>
<flag name="opencl">
Build OpenCL binaries.
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index e099ba5579b7..48266d3c2975 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<use>
<flag name="profiler">
Installs the NVIDIA CUDA visual profiler.
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-cpanspec/metadata.xml
+++ b/dev-util/obs-service-cpanspec/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_files/metadata.xml
+++ b/dev-util/obs-service-download_files/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_src_package/metadata.xml
+++ b/dev-util/obs-service-download_src_package/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-download_url/metadata.xml
+++ b/dev-util/obs-service-download_url/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-extract_file/metadata.xml
+++ b/dev-util/obs-service-extract_file/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
index c1febdafc499..4c5f6d639d73 100644
--- a/dev-util/obs-service-format_spec_file/metadata.xml
+++ b/dev-util/obs-service-format_spec_file/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for openSUSE Build Service.
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-generator_driver_update_disk/metadata.xml
+++ b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-git_tarballs/metadata.xml
+++ b/dev-util/obs-service-git_tarballs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-github_tarballs/metadata.xml
+++ b/dev-util/obs-service-github_tarballs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
index bf2692f5562e..2cd2cffd90de 100644
--- a/dev-util/obs-service-meta/metadata.xml
+++ b/dev-util/obs-service-meta/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
</longdescription>
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-rearchive/metadata.xml
+++ b/dev-util/obs-service-rearchive/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-recompress/metadata.xml
+++ b/dev-util/obs-service-recompress/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-set_version/metadata.xml
+++ b/dev-util/obs-service-set_version/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
index bf2692f5562e..2cd2cffd90de 100644
--- a/dev-util/obs-service-source_validator/metadata.xml
+++ b/dev-util/obs-service-source_validator/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
</longdescription>
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-tar_scm/metadata.xml
+++ b/dev-util/obs-service-tar_scm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
index d4b914b8debe..5fb66fb52a1f 100644
--- a/dev-util/obs-service-update_source/metadata.xml
+++ b/dev-util/obs-service-update_source/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
index efc0b67b56e3..59c876845c5b 100644
--- a/dev-util/obs-service-verify_file/metadata.xml
+++ b/dev-util/obs-service-verify_file/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-util/omake/metadata.xml
+++ b/dev-util/omake/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 71f533fb42e2..22fd6feb1d72 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>suse</herd>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+</maintainer>
<longdescription lang="en">
Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
</longdescription>
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
index 934d5c44fc6f..3fdd61f906d7 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/metadata.xml
@@ -4,5 +4,8 @@
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
- <herd>shell-tools</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/dev-util/pida/metadata.xml b/dev-util/pida/metadata.xml
index 42c241eb0463..0637a538f8c3 100644
--- a/dev-util/pida/metadata.xml
+++ b/dev-util/pida/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">pida</remote-id>
</upstream>
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 938c704a8aa3..ab19a34f6cf7 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>jdhore@gentoo.org</email>
<name>Jeff Horelick</name>
@@ -11,6 +10,10 @@
<name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
<flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
index 1e47ef827d11..e63116b87c68 100644
--- a/dev-util/pkgconfig/metadata.xml
+++ b/dev-util/pkgconfig/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
index 0e42654984c7..3b4049cdb56f 100644
--- a/dev-util/plan9port/metadata.xml
+++ b/dev-util/plan9port/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>andy753421@gmail.com</email>
</maintainer>
@@ -9,6 +8,10 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Plan9Port is a set of Plan 9 utilities ported to the POSIX
environment - also know as Plan 9 from User Space.
diff --git a/dev-util/pmd/metadata.xml b/dev-util/pmd/metadata.xml
index 56443875fae5..90fac1dfb9a1 100644
--- a/dev-util/pmd/metadata.xml
+++ b/dev-util/pmd/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pmd</remote-id>
</upstream>
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index 2920253981cc..90c791c1ab18 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>no111u3@gmail.com</email>
<name>Boris Vinogradov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 76c91f263895..3b08d4f9af22 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
- <herd>suse</herd>
<maintainer>
<email>mpagano@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/dev-util/rbtools/metadata.xml
+++ b/dev-util/rbtools/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
index a07ab3cfb265..fd3275b550ad 100644
--- a/dev-util/rebar/metadata.xml
+++ b/dev-util/rebar/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
@@ -11,6 +10,10 @@
<name>Luis Ressel</name>
<description>Proxy-maintainer, assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">rebar/rebar</remote-id>
</upstream>
diff --git a/dev-util/regexxer/metadata.xml b/dev-util/regexxer/metadata.xml
index bfb8e568fb12..f6fee2ece649 100644
--- a/dev-util/regexxer/metadata.xml
+++ b/dev-util/regexxer/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">regexxer</remote-id>
</upstream>
diff --git a/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml
index a337e79e8c73..8c2c7b468cb4 100644
--- a/dev-util/rosdep/metadata.xml
+++ b/dev-util/rosdep/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ros-infrastructure/rosdep</remote-id>
</upstream>
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
index 22272a81ac89..a47c8afb1262 100644
--- a/dev-util/rosinstall/metadata.xml
+++ b/dev-util/rosinstall/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">vcstools/rosinstall</remote-id>
</upstream>
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
index e4e50ba004c2..e645cad210a9 100644
--- a/dev-util/rosinstall_generator/metadata.xml
+++ b/dev-util/rosinstall_generator/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ros-infrastructure/rosinstall_generator</remote-id>
</upstream>
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
index 68b30527c024..01ad1fbd1574 100644
--- a/dev-util/scala-ide/metadata.xml
+++ b/dev-util/scala-ide/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
<maintainer>
<email>monsieurp@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml
index 1181e65fb7d3..af109b1694bb 100644
--- a/dev-util/scons/metadata.xml
+++ b/dev-util/scons/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
SCons is a make replacement providing a range of enhanced
features such as automated dependency generation and built in
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
index 67dfac8ca4f4..30029adc6d76 100644
--- a/dev-util/setconf/metadata.xml
+++ b/dev-util/setconf/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
- <herd>shell-tools</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index 5f6d825d5f9a..7bc6ee8ea837 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<maintainer>
<email>jlec@gentoo.org</email>
<name>Justin Lecher</name>
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
index dbb21d6b2945..7eb910daeb1d 100644
--- a/dev-util/shelltestrunner/metadata.xml
+++ b/dev-util/shelltestrunner/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
+ <maintainer>
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
<longdescription>
shelltestrunner is a cross-platform tool for testing command-line
programs (or arbitrary shell commands.) It reads simple declarative tests
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index d9096ef82092..7a53dbeb0ef9 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
<maintainer>
<email>vapier@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">shflags</remote-id>
<remote-id type="github">kward/shflags</remote-id>
diff --git a/dev-util/shtool/metadata.xml b/dev-util/shtool/metadata.xml
index 028d1cef3af8..097975e3adc2 100644
--- a/dev-util/shtool/metadata.xml
+++ b/dev-util/shtool/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
</pkgmetadata>
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
index 0d72971c67e1..a9b2488a9be6 100644
--- a/dev-util/skipfish/metadata.xml
+++ b/dev-util/skipfish/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>givi-zurabovich@mail.ru</email>
<name>Georgy Kovtunov</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">skipfish</remote-id>
</upstream>
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
index 12ec8af3d77a..b5607a5f0fc0 100644
--- a/dev-util/spec-cleaner/metadata.xml
+++ b/dev-util/spec-cleaner/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>suse</herd>
+ <maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+ </maintainer>
<upstream>
<remote-id type="github">openSUSE/spec-cleaner</remote-id>
</upstream>
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index 0ca954da6d5f..9c35a4b7c9ec 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<use>
<flag name="aio">
Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index b12171d137ee..bba503417c59 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>suse</herd>
+ <maintainer>
+ <email>suse@gentoo.org</email>
+ <name>SUSE</name>
+ </maintainer>
<use>
<flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
</use>
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
index 3df908a9c339..e9b5d3c1976e 100644
--- a/dev-util/tailor/metadata.xml
+++ b/dev-util/tailor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
Tailor is a tool to migrate changesets between ArX, Bazaar,
Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone,
diff --git a/dev-util/tkdiff/metadata.xml b/dev-util/tkdiff/metadata.xml
index e2cbb4ff9322..bb651e5939fc 100644
--- a/dev-util/tkdiff/metadata.xml
+++ b/dev-util/tkdiff/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tcltk</herd>
+ <maintainer>
+ <email>tcltk@gentoo.org</email>
+ <name>Gentoo Tcltk Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">tkdiff</remote-id>
</upstream>
diff --git a/dev-util/treecc/metadata.xml b/dev-util/treecc/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/dev-util/treecc/metadata.xml
+++ b/dev-util/treecc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>dotnet</herd>
+<maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
index 6227bf2f489c..df953e8746eb 100644
--- a/dev-util/txt2regex/metadata.xml
+++ b/dev-util/txt2regex/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">txt2regex</remote-id>
</upstream>
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/dev-util/unifdef/metadata.xml
+++ b/dev-util/unifdef/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml
index c019dcc590d4..24cee61bf4f6 100644
--- a/dev-util/universalindentgui/metadata.xml
+++ b/dev-util/universalindentgui/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
<maintainer>
<email>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<use>
<flag name="html">Add support for HTML files</flag>
</use>
diff --git a/dev-util/vdkbuilder/metadata.xml b/dev-util/vdkbuilder/metadata.xml
index 7f6fbc2997c2..9b4d256ecd8c 100644
--- a/dev-util/vdkbuilder/metadata.xml
+++ b/dev-util/vdkbuilder/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>lang-misc</herd>
<upstream>
<remote-id type="sourceforge">vdkbuilder</remote-id>
</upstream>
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
index f5b2d29b8036..602403218447 100644
--- a/dev-util/visual-regexp/metadata.xml
+++ b/dev-util/visual-regexp/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>quentin@minster.io</email>
<name>Quentin Minster</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
index 2c5fccdf3d93..d39e9af86c8c 100644
--- a/dev-util/visualvm/metadata.xml
+++ b/dev-util/visualvm/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
<longdescription>The IcedTea project provides a harness to build the source code from VisualVM. </longdescription>
</pkgmetadata>
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
index a4d63710b914..957427e97ceb 100644
--- a/dev-util/w32api/metadata.xml
+++ b/dev-util/w32api/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mingw</remote-id>
</upstream>
diff --git a/dev-util/watchr/metadata.xml b/dev-util/watchr/metadata.xml
index 3c43de11d5ec..409d99ea230c 100644
--- a/dev-util/watchr/metadata.xml
+++ b/dev-util/watchr/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer><email>graaff@gentoo.org</email></maintainer>
-<herd>ruby</herd>
+<maintainer>
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
index 3e44b6f956f2..16839d5f714f 100644
--- a/dev-util/webstorm/metadata.xml
+++ b/dev-util/webstorm/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>gert@gepe-biljarts.be</email>
<name>Gert Pellin</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js
</longdescription>
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index 4ed449fcc080..771faa7ed817 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
<maintainer>
<email>amynka@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">weka</remote-id>
</upstream>
diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
index fd3fa9a0ad5e..012ea5f8a72e 100644
--- a/dev-util/wstool/metadata.xml
+++ b/dev-util/wstool/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ros</herd>
+ <maintainer>
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">vcstools/wstool</remote-id>
</upstream>
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
index 72b7c58382b4..0f042550d7df 100644
--- a/dev-util/wxglade/metadata.xml
+++ b/dev-util/wxglade/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>wxwidgets</herd>
+ <maintainer>
+ <email>wxwidgets@gentoo.org</email>
+ <name>Gentoo wxWidgets Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wxglade</remote-id>
</upstream>
diff --git a/dev-util/xmlindent/metadata.xml b/dev-util/xmlindent/metadata.xml
index bfcd6bf8d100..9a52c7f55d8d 100644
--- a/dev-util/xmlindent/metadata.xml
+++ b/dev-util/xmlindent/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dev-tools</herd>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
index 41a7cb7c7441..ba98006324a1 100644
--- a/dev-util/yuicompressor/metadata.xml
+++ b/dev-util/yuicompressor/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">yui/yuicompressor</remote-id>
</upstream>