summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /www-apps
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/Apache-Gallery/metadata.xml5
-rw-r--r--www-apps/b2evolution/metadata.xml5
-rw-r--r--www-apps/bitten/metadata.xml5
-rw-r--r--www-apps/bugzilla/metadata.xml10
-rw-r--r--www-apps/cgit/metadata.xml10
-rw-r--r--www-apps/collectd-web/metadata.xml5
-rw-r--r--www-apps/coppermine/metadata.xml5
-rw-r--r--www-apps/curator/metadata.xml5
-rw-r--r--www-apps/cvsweb/metadata.xml5
-rw-r--r--www-apps/dokuwiki/metadata.xml5
-rw-r--r--www-apps/dotproject/metadata.xml5
-rw-r--r--www-apps/dragonflycms/metadata.xml5
-rw-r--r--www-apps/drraw/metadata.xml5
-rw-r--r--www-apps/drupal/metadata.xml5
-rw-r--r--www-apps/dspam-web/metadata.xml5
-rw-r--r--www-apps/egroupware/metadata.xml5
-rw-r--r--www-apps/freeradius-dialupadmin/metadata.xml1
-rw-r--r--www-apps/gallery/metadata.xml5
-rw-r--r--www-apps/gitit/metadata.xml1
-rw-r--r--www-apps/gnopaste/metadata.xml5
-rw-r--r--www-apps/groupoffice/metadata.xml5
-rw-r--r--www-apps/horde-chora/metadata.xml5
-rw-r--r--www-apps/horde-dimp/metadata.xml5
-rw-r--r--www-apps/horde-gollem/metadata.xml5
-rw-r--r--www-apps/horde-hermes/metadata.xml5
-rw-r--r--www-apps/horde-imp/metadata.xml5
-rw-r--r--www-apps/horde-ingo/metadata.xml5
-rw-r--r--www-apps/horde-jeta/metadata.xml5
-rw-r--r--www-apps/horde-kronolith/metadata.xml5
-rw-r--r--www-apps/horde-mimp/metadata.xml5
-rw-r--r--www-apps/horde-mnemo/metadata.xml5
-rw-r--r--www-apps/horde-nag/metadata.xml5
-rw-r--r--www-apps/horde-passwd/metadata.xml5
-rw-r--r--www-apps/horde-pear/metadata.xml5
-rw-r--r--www-apps/horde-turba/metadata.xml5
-rw-r--r--www-apps/horde/metadata.xml5
-rw-r--r--www-apps/joomla/metadata.xml10
-rw-r--r--www-apps/kibana-bin/metadata.xml5
-rw-r--r--www-apps/lxr/metadata.xml5
-rw-r--r--www-apps/mantisbt/metadata.xml5
-rw-r--r--www-apps/mediawiki/metadata.xml5
-rw-r--r--www-apps/metadot/metadata.xml5
-rw-r--r--www-apps/mod_survey/metadata.xml5
-rw-r--r--www-apps/moinmoin/metadata.xml5
-rw-r--r--www-apps/moodle/metadata.xml5
-rw-r--r--www-apps/mypictures/metadata.xml5
-rw-r--r--www-apps/mythweb/metadata.xml10
-rw-r--r--www-apps/nanoblogger/metadata.xml5
-rw-r--r--www-apps/nanoc/metadata.xml5
-rw-r--r--www-apps/nikola/metadata.xml5
-rw-r--r--www-apps/openwebstats/metadata.xml5
-rw-r--r--www-apps/otrs/metadata.xml10
-rw-r--r--www-apps/owncloud/metadata.xml5
-rw-r--r--www-apps/pcgi/metadata.xml5
-rw-r--r--www-apps/phpBB/metadata.xml5
-rw-r--r--www-apps/phpmp/metadata.xml10
-rw-r--r--www-apps/phprojekt/metadata.xml5
-rw-r--r--www-apps/phpsysinfo/metadata.xml5
-rw-r--r--www-apps/phpwebsite/metadata.xml5
-rw-r--r--www-apps/polarblog/metadata.xml5
-rw-r--r--www-apps/postfixadmin/metadata.xml5
-rw-r--r--www-apps/pyblosxom/metadata.xml5
-rw-r--r--www-apps/roundup/metadata.xml5
-rw-r--r--www-apps/rt/metadata.xml10
-rw-r--r--www-apps/rutorrent/metadata.xml5
-rw-r--r--www-apps/sitebar/metadata.xml5
-rw-r--r--www-apps/sugarcrm/metadata.xml5
-rw-r--r--www-apps/trac/metadata.xml5
-rw-r--r--www-apps/venus/metadata.xml5
-rw-r--r--www-apps/viewvc/metadata.xml5
-rw-r--r--www-apps/webdavcgi/metadata.xml5
-rw-r--r--www-apps/websvn/metadata.xml5
-rw-r--r--www-apps/wiliki/metadata.xml5
-rw-r--r--www-apps/wordpress/metadata.xml5
74 files changed, 316 insertions, 81 deletions
diff --git a/www-apps/Apache-Gallery/metadata.xml b/www-apps/Apache-Gallery/metadata.xml
index 6632069b5af..0496fdd3267 100644
--- a/www-apps/Apache-Gallery/metadata.xml
+++ b/www-apps/Apache-Gallery/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index 3a17645547f..9af9221742f 100644
--- a/www-apps/b2evolution/metadata.xml
+++ b/www-apps/b2evolution/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">evocms</remote-id>
</upstream>
diff --git a/www-apps/bitten/metadata.xml b/www-apps/bitten/metadata.xml
index cb24426f19f..4a0ffc95917 100644
--- a/www-apps/bitten/metadata.xml
+++ b/www-apps/bitten/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>
<use>
<flag name="server">Install master instance that integrates itself with Trac</flag>
</use>
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 7c2eecef180..b905a109f84 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,13 +1,19 @@
<?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@xayto.net</email>
<name>Craig Inches</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="extras">Optional Perl modules</flag>
<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 65409f295d3..9a9693c1902 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
cgit - cgi for git
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
index 54d3aadfce8..5b6d3ddae50 100644
--- a/www-apps/collectd-web/metadata.xml
+++ b/www-apps/collectd-web/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="github">httpdss/collectd-web</remote-id>
</upstream>
diff --git a/www-apps/coppermine/metadata.xml b/www-apps/coppermine/metadata.xml
index 276a32a3c82..227486c1185 100644
--- a/www-apps/coppermine/metadata.xml
+++ b/www-apps/coppermine/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">eenemeenemuu.u</remote-id>
</upstream>
diff --git a/www-apps/curator/metadata.xml b/www-apps/curator/metadata.xml
index e81bafe6898..0f5513f8648 100644
--- a/www-apps/curator/metadata.xml
+++ b/www-apps/curator/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>web-apps</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/cvsweb/metadata.xml b/www-apps/cvsweb/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/cvsweb/metadata.xml
+++ b/www-apps/cvsweb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 777b49b1aa7..ec40ba43b15 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/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>web-apps</herd>
<maintainer>
<email>jmbsvicetto@gentoo.org</email>
<name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription lang="en">
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
creating documentation of any kind. It is targeted at developer teams,
diff --git a/www-apps/dotproject/metadata.xml b/www-apps/dotproject/metadata.xml
index bd5db4864e4..a3d7c5bdbcb 100644
--- a/www-apps/dotproject/metadata.xml
+++ b/www-apps/dotproject/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dotproject</remote-id>
</upstream>
diff --git a/www-apps/dragonflycms/metadata.xml b/www-apps/dragonflycms/metadata.xml
index fea7d5fbc77..2f8777b26af 100644
--- a/www-apps/dragonflycms/metadata.xml
+++ b/www-apps/dragonflycms/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription lang="en">
CPG Dragonfly CMS is a feature-rich open source content management system
based off of PHP-Nuke 6.5
diff --git a/www-apps/drraw/metadata.xml b/www-apps/drraw/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/drraw/metadata.xml
+++ b/www-apps/drraw/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index c9bd514760a..da2575e7919 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<use>
<flag name="accelerator">Add dependency on a php accelerator</flag>
<flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
diff --git a/www-apps/dspam-web/metadata.xml b/www-apps/dspam-web/metadata.xml
index 4f3fa398a3f..708508c7b8f 100644
--- a/www-apps/dspam-web/metadata.xml
+++ b/www-apps/dspam-web/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>Web Administrative interface for a statistical-algorithmic hybrid anti-spam filter</longdescription>
</pkgmetadata>
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 93bdf0b618b..7d9a3d1f645 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="jpgraph">Add <pkg>dev-php/jpgraph</pkg> support</flag>
<flag name="gallery">Install gallery2 port for eGW</flag>
diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
index 02f3dbc904a..90c4bce39bc 100644
--- a/www-apps/freeradius-dialupadmin/metadata.xml
+++ b/www-apps/freeradius-dialupadmin/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>net-dialup</herd>
<longdescription>
The FreeRADIUS server comes including a powerfull web interface written in PHP
to administer radius users, called dialupadmin. Dialup Admin supports users
diff --git a/www-apps/gallery/metadata.xml b/www-apps/gallery/metadata.xml
index 479dd79246b..b3610927696 100644
--- a/www-apps/gallery/metadata.xml
+++ b/www-apps/gallery/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>web-apps</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="netpbm">Add <pkg>media-libs/netpbm</pkg> support</flag>
<flag name="unzip">Add <pkg>app-arch/unzip</pkg> support for the archive
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
index 223121355cf..227d8de10cb 100644
--- a/www-apps/gitit/metadata.xml
+++ b/www-apps/gitit/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>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
diff --git a/www-apps/gnopaste/metadata.xml b/www-apps/gnopaste/metadata.xml
index 5f4a90172f2..d83dc355d2d 100644
--- a/www-apps/gnopaste/metadata.xml
+++ b/www-apps/gnopaste/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gnopaste</remote-id>
</upstream>
diff --git a/www-apps/groupoffice/metadata.xml b/www-apps/groupoffice/metadata.xml
index fa669a99b3e..152709175d1 100644
--- a/www-apps/groupoffice/metadata.xml
+++ b/www-apps/groupoffice/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">group-office</remote-id>
</upstream>
diff --git a/www-apps/horde-chora/metadata.xml b/www-apps/horde-chora/metadata.xml
index 60478682cdb..8606519e653 100644
--- a/www-apps/horde-chora/metadata.xml
+++ b/www-apps/horde-chora/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Chora is our tool for viewing code repositories that are managed using
the CVS source control system. It aims to provide a high degree of
diff --git a/www-apps/horde-dimp/metadata.xml b/www-apps/horde-dimp/metadata.xml
index 105739700b7..64ed48f894d 100644
--- a/www-apps/horde-dimp/metadata.xml
+++ b/www-apps/horde-dimp/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Horde DIMP is a alternate presentation view of IMP using AJAX-ish
technologies.
diff --git a/www-apps/horde-gollem/metadata.xml b/www-apps/horde-gollem/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/horde-gollem/metadata.xml
+++ b/www-apps/horde-gollem/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/horde-hermes/metadata.xml b/www-apps/horde-hermes/metadata.xml
index 19e58ab40b7..1af6e665431 100644
--- a/www-apps/horde-hermes/metadata.xml
+++ b/www-apps/horde-hermes/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Hermes is a time-tracking application integrated with the Horde Framework. It ties into Turba (to retrieve clients) and Nag and Whups (to retrieve cost objects). It comes with a stop watch, search and reporting capabilities, and an invoice interface.
</longdescription>
diff --git a/www-apps/horde-imp/metadata.xml b/www-apps/horde-imp/metadata.xml
index 80a52651e16..9910036ccf3 100644
--- a/www-apps/horde-imp/metadata.xml
+++ b/www-apps/horde-imp/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription>
IMP is the Internet Messaging Program. It is written in PHP and provides
webmail access to IMAP and POP3 accounts.
diff --git a/www-apps/horde-ingo/metadata.xml b/www-apps/horde-ingo/metadata.xml
index 7724759b556..3d427cd72c0 100644
--- a/www-apps/horde-ingo/metadata.xml
+++ b/www-apps/horde-ingo/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Ingo is an email filter rules manager.
</longdescription>
diff --git a/www-apps/horde-jeta/metadata.xml b/www-apps/horde-jeta/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/horde-jeta/metadata.xml
+++ b/www-apps/horde-jeta/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/horde-kronolith/metadata.xml b/www-apps/horde-kronolith/metadata.xml
index 23226ecc99a..81b2b6e2f12 100644
--- a/www-apps/horde-kronolith/metadata.xml
+++ b/www-apps/horde-kronolith/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Kronolith is the Horde calendar application. It provides a stable and
featureful individual calendar system for every Horde user, and
diff --git a/www-apps/horde-mimp/metadata.xml b/www-apps/horde-mimp/metadata.xml
index 6632069b5af..0496fdd3267 100644
--- a/www-apps/horde-mimp/metadata.xml
+++ b/www-apps/horde-mimp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/horde-mnemo/metadata.xml b/www-apps/horde-mnemo/metadata.xml
index e842c3a05b6..ffb4ba50032 100644
--- a/www-apps/horde-mnemo/metadata.xml
+++ b/www-apps/horde-mnemo/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Mnemo is a note manager.
</longdescription>
diff --git a/www-apps/horde-nag/metadata.xml b/www-apps/horde-nag/metadata.xml
index 0df3fe67cab..d07be0198de 100644
--- a/www-apps/horde-nag/metadata.xml
+++ b/www-apps/horde-nag/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Nag is a simple, multiuser task list manager.
</longdescription>
diff --git a/www-apps/horde-passwd/metadata.xml b/www-apps/horde-passwd/metadata.xml
index 25b7fa5ba02..75018ff9500 100644
--- a/www-apps/horde-passwd/metadata.xml
+++ b/www-apps/horde-passwd/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Passwd is the Horde password changing application. While it has been
released and is in production use at many sites, it is also under heavy
diff --git a/www-apps/horde-pear/metadata.xml b/www-apps/horde-pear/metadata.xml
index 449e031b533..06d1cabb950 100644
--- a/www-apps/horde-pear/metadata.xml
+++ b/www-apps/horde-pear/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Horde 2.x, IMP 3.x, and all other Horde applications make use of the
PEAR libraries to handle such tasks as database abstraction, mail
diff --git a/www-apps/horde-turba/metadata.xml b/www-apps/horde-turba/metadata.xml
index f39fa43df11..e966a3c094e 100644
--- a/www-apps/horde-turba/metadata.xml
+++ b/www-apps/horde-turba/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
Turba is the Horde contact management application. It is a production
level address book, and makes heavy use of the Horde framework to
diff --git a/www-apps/horde/metadata.xml b/www-apps/horde/metadata.xml
index 1f0aa4dd26b..7226b672494 100644
--- a/www-apps/horde/metadata.xml
+++ b/www-apps/horde/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>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
<longdescription>
The Horde Application Framework is a general-purpose web application
framework in PHP, providing classes for dealing with preferences,
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 623cf9b6e89..c88b3730214 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>harold@naparst.com</email>
<name>Harold Naparst</name>
@@ -17,6 +15,14 @@
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Joomla is an award-winning content management system (CMS), which enables you to build Web sites and powerful online applications.
</longdescription>
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index fe6f9ccf1a7..e782c4f7912 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/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>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>
</pkgmetadata>
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
index d50c1bef73f..969ee5b35e3 100644
--- a/www-apps/lxr/metadata.xml
+++ b/www-apps/lxr/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lxr</remote-id>
</upstream>
diff --git a/www-apps/mantisbt/metadata.xml b/www-apps/mantisbt/metadata.xml
index e5a305eb81c..62eb69c90c3 100644
--- a/www-apps/mantisbt/metadata.xml
+++ b/www-apps/mantisbt/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>web-apps</herd>
<maintainer>
<email>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<maintainer>
<email>d@hx.id.au</email>
diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/mediawiki/metadata.xml
+++ b/www-apps/mediawiki/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/metadot/metadata.xml b/www-apps/metadot/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/metadot/metadata.xml
+++ b/www-apps/metadot/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/mod_survey/metadata.xml b/www-apps/mod_survey/metadata.xml
index 6632069b5af..0496fdd3267 100644
--- a/www-apps/mod_survey/metadata.xml
+++ b/www-apps/mod_survey/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/moinmoin/metadata.xml b/www-apps/moinmoin/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/moinmoin/metadata.xml
+++ b/www-apps/moinmoin/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
index 3cf0cd5be0b..8e9dd5e0390 100644
--- a/www-apps/moodle/metadata.xml
+++ b/www-apps/moodle/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>web-apps</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/mypictures/metadata.xml b/www-apps/mypictures/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/mypictures/metadata.xml
+++ b/www-apps/mypictures/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/mythweb/metadata.xml b/www-apps/mythweb/metadata.xml
index bbe97fab0a7..f5d6be1ffa6 100644
--- a/www-apps/mythweb/metadata.xml
+++ b/www-apps/mythweb/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mythtv</herd>
- <herd>web-apps</herd>
<maintainer>
<email>cardoe@gentoo.org</email>
<description>Do not CC me on bugs</description>
</maintainer>
+ <maintainer>
+ <email>mythtv@gentoo.org</email>
+ <name>MythTV</name>
+ </maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="github">MythTV/mythweb</remote-id>
</upstream>
diff --git a/www-apps/nanoblogger/metadata.xml b/www-apps/nanoblogger/metadata.xml
index 194b9f320e1..a43d22574e0 100644
--- a/www-apps/nanoblogger/metadata.xml
+++ b/www-apps/nanoblogger/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription lang="en">
Nanoblogger is a small weblog engine written in Bash for the command line. It
uses common UNIX tools such as cat, grep, and sed. Features include: support
diff --git a/www-apps/nanoc/metadata.xml b/www-apps/nanoc/metadata.xml
index 3c43de11d5e..409d99ea230 100644
--- a/www-apps/nanoc/metadata.xml
+++ b/www-apps/nanoc/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/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 84a1db7d3b1..47c38a6216e 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/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>python</herd>
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<use>
<flag name="assets">
Support web asset management through <pkg>dev-python/assets</pkg>
diff --git a/www-apps/openwebstats/metadata.xml b/www-apps/openwebstats/metadata.xml
index dc9438ea01a..8a81d8c08d5 100644
--- a/www-apps/openwebstats/metadata.xml
+++ b/www-apps/openwebstats/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">openwebstats</remote-id>
</upstream>
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 5a5ec122745..d9716e27c6e 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lists@xunil.at</email>
<name>Stefan Weichinger</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
</use>
diff --git a/www-apps/owncloud/metadata.xml b/www-apps/owncloud/metadata.xml
index 6895c80555d..b4b967307a2 100644
--- a/www-apps/owncloud/metadata.xml
+++ b/www-apps/owncloud/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>web-apps</herd>
<maintainer>
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/pcgi/metadata.xml b/www-apps/pcgi/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/pcgi/metadata.xml
+++ b/www-apps/pcgi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml
index 6632069b5af..0496fdd3267 100644
--- a/www-apps/phpBB/metadata.xml
+++ b/www-apps/phpBB/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/phpmp/metadata.xml b/www-apps/phpmp/metadata.xml
index f78e909e6c9..ce37cc3d405 100644
--- a/www-apps/phpmp/metadata.xml
+++ b/www-apps/phpmp/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>sound</herd>
- <herd>web-apps</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/www-apps/phprojekt/metadata.xml b/www-apps/phprojekt/metadata.xml
index 44cdf35091f..d227678cea4 100644
--- a/www-apps/phprojekt/metadata.xml
+++ b/www-apps/phprojekt/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="github">Mayflower/PHProjekt</remote-id>
</upstream>
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 768048d28c6..469a31d3029 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="github">rk4an/phpsysinfo</remote-id>
</upstream>
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
index f04a5186b05..12167139b5a 100644
--- a/www-apps/phpwebsite/metadata.xml
+++ b/www-apps/phpwebsite/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
<upstream>
<remote-id type="sourceforge">phpwebsite</remote-id>
diff --git a/www-apps/polarblog/metadata.xml b/www-apps/polarblog/metadata.xml
index 95c06f0095b..5267114f8a2 100644
--- a/www-apps/polarblog/metadata.xml
+++ b/www-apps/polarblog/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>web-apps</herd>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
index 6266de700fd..51365cb60ef 100644
--- a/www-apps/postfixadmin/metadata.xml
+++ b/www-apps/postfixadmin/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="vacation">Install vacation.pl script and dependencies</flag>
</use>
diff --git a/www-apps/pyblosxom/metadata.xml b/www-apps/pyblosxom/metadata.xml
index 11cefb5a384..51f7662527f 100644
--- a/www-apps/pyblosxom/metadata.xml
+++ b/www-apps/pyblosxom/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pyblosxom</remote-id>
</upstream>
diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
index c512aabf25d..9cfdad250d3 100644
--- a/www-apps/roundup/metadata.xml
+++ b/www-apps/roundup/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">roundup</remote-id>
<remote-id type="sourceforge">roundup</remote-id>
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
index 1a61ca9bfee..4555b15e1e7 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
@@ -11,6 +9,14 @@
<email>eric.joshua.martin@gmail.com</email>
<name>Eric Martin</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
</use>
diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
index 9dfa6228541..04a27ac19fb 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">rutorrent</remote-id>
<remote-id type="github">Novik/ruTorrent</remote-id>
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
index 2d3672bfffd..9b70833a11b 100644
--- a/www-apps/sitebar/metadata.xml
+++ b/www-apps/sitebar/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="plugins">Install optional plugins</flag>
</use>
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index a6e3b05753c..b64c0c7ba8b 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/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>
<name>Andreis Vinogradovs</name>
@@ -10,6 +9,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
</use>
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 01f0547d2d1..5220ec6be67 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/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>web-apps</herd>
<maintainer>
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="i18n">Enable support for i18n with dev-python/Babel</flag>
<flag name="highlight">Enable syntax highlighting</flag>
diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
index 88181d6daf3..99fbb489126 100644
--- a/www-apps/venus/metadata.xml
+++ b/www-apps/venus/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>web-apps</herd>
<maintainer>
<email>tampakrap@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="django">Support for django template style to config files</flag>
<flag name="genshi">Support for genshi style to config files</flag>
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
index 15664488cce..8d0d0a61245 100644
--- a/www-apps/viewvc/metadata.xml
+++ b/www-apps/viewvc/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="cvsgraph">Add <pkg>dev-vcs/cvsgraph</pkg> support to show graphical views of revisions and branches</flag>
<flag name="mod_wsgi">Add <pkg>www-apache/mod_wsgi</pkg> support</flag>
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
index d68a2a4f22b..9e2b880b861 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/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>c.affolter@stepping-stone.ch</email>
<description>Maintainer</description>
@@ -10,6 +9,10 @@
<email>dev-zero@gentoo.org</email>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
WebDAV CGI is a Perl CGI script that enables the WebDAV protocol
(class 1,2,3) for Web server to manage Web sites or to use a Web server
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index 48e01138b4b..d6f3c7287d1 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<longdescription>
Web based Subversion repository browser written in PHP
</longdescription>
diff --git a/www-apps/wiliki/metadata.xml b/www-apps/wiliki/metadata.xml
index 81aa0dcdd19..9ef33b75700 100644
--- a/www-apps/wiliki/metadata.xml
+++ b/www-apps/wiliki/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>scheme</herd>
+ <maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+ </maintainer>
<longdescription>
WiLiKi is a lightweight Wiki Engine written in Scheme.
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
index c9b584fe6f2..7d4580f69fc 100644
--- a/www-apps/wordpress/metadata.xml
+++ b/www-apps/wordpress/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>web-apps</herd>
+<maintainer>
+<email>web-apps@gentoo.org</email>
+<name>Gentoo Webapps</name>
+</maintainer>
<use>
<flag name="akismet">Installs Akismet comment spam plug-in</flag>
<flag name="themes">Installs themes (including default theme)</flag>