summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-25 00:06:09 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-25 00:06:09 +0100
commit738eb5a9f952ee02ddce836b9d56350bcacbadf5 (patch)
treea21afee4ca8408110900d68d07c52d74d10a26f2 /www-apps
parentMerge branch 'tvheadend' (diff)
parentSet appropriate maintainer types in metadata.xml (GLEP 67) (diff)
downloadgentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.tar.gz
gentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.tar.bz2
gentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.zip
Merge the GLEP 67 transition changes
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/389-dsgw/metadata.xml3
-rw-r--r--www-apps/Apache-Gallery/metadata.xml5
-rw-r--r--www-apps/agendav/metadata.xml2
-rw-r--r--www-apps/ampache/metadata.xml4
-rw-r--r--www-apps/b2evolution/metadata.xml5
-rw-r--r--www-apps/baikal/metadata.xml2
-rw-r--r--www-apps/bitten/metadata.xml7
-rw-r--r--www-apps/blazeblogger/metadata.xml2
-rw-r--r--www-apps/blohg-tumblelog/metadata.xml2
-rw-r--r--www-apps/blohg/metadata.xml2
-rw-r--r--www-apps/browser-config/metadata.xml4
-rw-r--r--www-apps/bugzilla/metadata.xml12
-rw-r--r--www-apps/cgisysinfo/metadata.xml3
-rw-r--r--www-apps/cgit/metadata.xml13
-rw-r--r--www-apps/collectd-web/metadata.xml5
-rw-r--r--www-apps/coppermine/metadata.xml5
-rw-r--r--www-apps/curator/metadata.xml7
-rw-r--r--www-apps/cvsweb/metadata.xml5
-rw-r--r--www-apps/davical/metadata.xml2
-rw-r--r--www-apps/dokuwiki/metadata.xml7
-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.xml9
-rw-r--r--www-apps/dspam-web/metadata.xml5
-rw-r--r--www-apps/egroupware/metadata.xml5
-rw-r--r--www-apps/eyeos/metadata.xml2
-rw-r--r--www-apps/freeradius-dialupadmin/metadata.xml1
-rw-r--r--www-apps/gallery/metadata.xml7
-rw-r--r--www-apps/gitit/metadata.xml13
-rw-r--r--www-apps/gnopaste/metadata.xml5
-rw-r--r--www-apps/groupoffice/metadata.xml5
-rw-r--r--www-apps/guacamole/metadata.xml2
-rw-r--r--www-apps/hiawatha-monitor/metadata.xml4
-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.xml7
-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/icingaweb2-module-pnp4nagios/metadata.xml2
-rw-r--r--www-apps/icingaweb2/metadata.xml2
-rw-r--r--www-apps/ikiwiki/metadata.xml2
-rw-r--r--www-apps/jekyll-coffeescript/metadata.xml2
-rw-r--r--www-apps/jekyll-gist/metadata.xml2
-rw-r--r--www-apps/jekyll-paginate/metadata.xml2
-rw-r--r--www-apps/jekyll-sass-converter/metadata.xml2
-rw-r--r--www-apps/jekyll-sitemap/metadata.xml2
-rw-r--r--www-apps/jekyll-watch/metadata.xml2
-rw-r--r--www-apps/jekyll/metadata.xml2
-rw-r--r--www-apps/joomla/metadata.xml16
-rw-r--r--www-apps/kibana-bin/metadata.xml7
-rw-r--r--www-apps/liquid_feedback_core/metadata.xml2
-rw-r--r--www-apps/liquid_feedback_frontend/metadata.xml2
-rw-r--r--www-apps/lxr/metadata.xml5
-rw-r--r--www-apps/mantisbt/metadata.xml7
-rw-r--r--www-apps/mediawiki/metadata.xml5
-rw-r--r--www-apps/metadot/metadata.xml5
-rw-r--r--www-apps/mirmon/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.xml7
-rw-r--r--www-apps/mypictures/metadata.xml5
-rw-r--r--www-apps/mythweb/metadata.xml12
-rw-r--r--www-apps/nanoblogger/metadata.xml5
-rw-r--r--www-apps/nanoc/metadata.xml7
-rw-r--r--www-apps/nikola/metadata.xml7
-rw-r--r--www-apps/novnc/metadata.xml4
-rw-r--r--www-apps/openwebstats/metadata.xml5
-rw-r--r--www-apps/otrs/metadata.xml13
-rw-r--r--www-apps/owncloud/metadata.xml7
-rw-r--r--www-apps/ownpaste/metadata.xml2
-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/redmine/metadata.xml7
-rw-r--r--www-apps/rocketwiki-lqfb/metadata.xml3
-rw-r--r--www-apps/roundup/metadata.xml7
-rw-r--r--www-apps/rt/metadata.xml14
-rw-r--r--www-apps/rutorrent/metadata.xml6
-rw-r--r--www-apps/scgi/metadata.xml1
-rw-r--r--www-apps/sitebar/metadata.xml5
-rw-r--r--www-apps/sugarcrm/metadata.xml9
-rw-r--r--www-apps/trac-accountmanager/metadata.xml4
-rw-r--r--www-apps/trac-downloads/metadata.xml3
-rw-r--r--www-apps/trac-mercurial/metadata.xml5
-rw-r--r--www-apps/trac-tags/metadata.xml3
-rw-r--r--www-apps/trac/metadata.xml7
-rw-r--r--www-apps/tt-rss/metadata.xml2
-rw-r--r--www-apps/venus/metadata.xml8
-rw-r--r--www-apps/viewvc/metadata.xml5
-rw-r--r--www-apps/webdavcgi/metadata.xml9
-rw-r--r--www-apps/webmcp/metadata.xml2
-rw-r--r--www-apps/websvn/metadata.xml7
-rw-r--r--www-apps/wiliki/metadata.xml5
-rw-r--r--www-apps/wordpress/metadata.xml5
111 files changed, 392 insertions, 180 deletions
diff --git a/www-apps/389-dsgw/metadata.xml b/www-apps/389-dsgw/metadata.xml
index f0da01e449a4..a2c412af181e 100644
--- a/www-apps/389-dsgw/metadata.xml
+++ b/www-apps/389-dsgw/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
<use>
<flag name="adminserver">Install DSGW with Admin Server</flag>
</use>
diff --git a/www-apps/Apache-Gallery/metadata.xml b/www-apps/Apache-Gallery/metadata.xml
index 6632069b5aff..2b9b44f73497 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 type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/agendav/metadata.xml b/www-apps/agendav/metadata.xml
index c4dd21f48526..33a49a010167 100644
--- a/www-apps/agendav/metadata.xml
+++ b/www-apps/agendav/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
</maintainer>
diff --git a/www-apps/ampache/metadata.xml b/www-apps/ampache/metadata.xml
index db86feeb54bc..a32ffbfee7ab 100644
--- a/www-apps/ampache/metadata.xml
+++ b/www-apps/ampache/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
</maintainer>
<use>
- <flag name='transcode'>Install optional dependencies for transcoding support</flag>
+ <flag name="transcode">Install optional dependencies for transcoding support</flag>
</use>
</pkgmetadata>
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index 3a17645547f8..2bd751aefd82 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 type="project">
+ <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/baikal/metadata.xml b/www-apps/baikal/metadata.xml
index 263de02a5e77..a53ffbea77d3 100644
--- a/www-apps/baikal/metadata.xml
+++ b/www-apps/baikal/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
</maintainer>
diff --git a/www-apps/bitten/metadata.xml b/www-apps/bitten/metadata.xml
index 10dc24f7fcbb..13974ff71af8 100644
--- a/www-apps/bitten/metadata.xml
+++ b/www-apps/bitten/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>python</herd>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<use>
- <flag name='server'>Install master instance that integrates itself with Trac</flag>
+ <flag name="server">Install master instance that integrates itself with Trac</flag>
</use>
</pkgmetadata>
diff --git a/www-apps/blazeblogger/metadata.xml b/www-apps/blazeblogger/metadata.xml
index 27aeb4d46934..c2f03805ce86 100644
--- a/www-apps/blazeblogger/metadata.xml
+++ b/www-apps/blazeblogger/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/www-apps/blohg-tumblelog/metadata.xml b/www-apps/blohg-tumblelog/metadata.xml
index 1f2cb18711c3..f8048e3efc32 100644
--- a/www-apps/blohg-tumblelog/metadata.xml
+++ b/www-apps/blohg-tumblelog/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
index f7cb22f5c7ee..bd59b4b58880 100644
--- a/www-apps/blohg/metadata.xml
+++ b/www-apps/blohg/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
diff --git a/www-apps/browser-config/metadata.xml b/www-apps/browser-config/metadata.xml
index 59e2b8f78cb5..097975e3adc2 100644
--- a/www-apps/browser-config/metadata.xml
+++ b/www-apps/browser-config/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
</pkgmetadata>
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 7c2eecef180c..7085b40159de 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>
+ <maintainer type="person">
<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 type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <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/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index 4b0a8a6e7cff..a20bd0a500ad 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
@@ -14,4 +14,3 @@
server.
</longdescription>
</pkgmetadata>
-
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 28667272885c..69f3e67fc202 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>
+ <maintainer type="person">
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
cgit - cgi for git
@@ -19,4 +25,3 @@
<flag name="jit">If the lua flag is enabled, jit uses LuaJIT instead of vanilla Lua</flag>
</use>
</pkgmetadata>
-
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
index 54d3aadfce8b..65d831e8d139 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 type="project">
+ <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 276a32a3c827..9987185d2085 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 type="project">
+ <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 e81bafe6898e..a68bb3e903dc 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>
+ <maintainer type="person">
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/davical/metadata.xml b/www-apps/davical/metadata.xml
index 6b1d02987300..a7029b1a1086 100644
--- a/www-apps/davical/metadata.xml
+++ b/www-apps/davical/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 777b49b1aa79..6cbe76a6b937 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>
+ <maintainer type="person">
<email>jmbsvicetto@gentoo.org</email>
<name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
+ <maintainer type="project">
+ <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 bd5db4864e44..d66b5239964e 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 type="project">
+ <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 fea7d5fbc77d..3ed033439b97 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 318cc2f778a1..0283916c75f4 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/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 type="project">
+ <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>
+ <flag name="accelerator">Add dependency on a php accelerator</flag>
+ <flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
</use>
</pkgmetadata>
diff --git a/www-apps/dspam-web/metadata.xml b/www-apps/dspam-web/metadata.xml
index 4f3fa398a3f9..55f6db411c72 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 type="project">
+ <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 93bdf0b618bc..aeebb7438631 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 type="project">
+ <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/eyeos/metadata.xml b/www-apps/eyeos/metadata.xml
index 03b74a95ece4..8b1ff2f2c914 100644
--- a/www-apps/eyeos/metadata.xml
+++ b/www-apps/eyeos/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
index 02f3dbc904a3..90c4bce39bc4 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 479dd79246b9..66e8ef844e60 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>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer type="project">
+ <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 acf3c3ee2a46..f5359672dbc6 100644
--- a/www-apps/gitit/metadata.xml
+++ b/www-apps/gitit/metadata.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
- <maintainer>
+ <maintainer type="project">
<email>haskell@gentoo.org</email>
</maintainer>
<longdescription>
Gitit is a wiki backed by a git, darcs, or mercurial
filestore. Pages and uploaded files can be modified either
- directly via the VCS&#39;s command-line tools or through
- the wiki&#39;s web interface. Pandoc is used for markup
+ directly via the VCS's command-line tools or through
+ the wiki's web interface. Pandoc is used for markup
processing, so pages may be written in
(extended) markdown, reStructuredText, LaTeX, HTML,
or literate Haskell, and exported in ten different
@@ -20,7 +19,7 @@
* plugins: dynamically loaded page
transformations written in Haskell (see
- &quot;Network.Gitit.Interface&quot;)
+ "Network.Gitit.Interface")
* conversion of TeX math to MathML for display in
web browsers
@@ -30,7 +29,7 @@
* Atom feeds (site-wide and per-page)
- * a library, &quot;Network.Gitit&quot;, that makes it simple
+ * a library, "Network.Gitit", that makes it simple
to include a gitit wiki in any happstack application
You can see a running demo at &lt;http://gitit.net&gt;.
@@ -38,7 +37,7 @@
For usage information: @gitit --help@
</longdescription>
<use>
- <flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+ <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
<flag name="plugins">enables optional plugin runtime loader</flag>
</use>
</pkgmetadata>
diff --git a/www-apps/gnopaste/metadata.xml b/www-apps/gnopaste/metadata.xml
index 5f4a90172f2d..00e684791565 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 type="project">
+ <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 fa669a99b3e4..1910a4d57726 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 type="project">
+ <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/guacamole/metadata.xml b/www-apps/guacamole/metadata.xml
index e69c10773c1a..a86d47c73c59 100644
--- a/www-apps/guacamole/metadata.xml
+++ b/www-apps/guacamole/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>nativemad@gentoo.org</email>
<name>Andreas Schuerch</name>
</maintainer>
diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml
index 38e716583fc7..ffeda0a1af46 100644
--- a/www-apps/hiawatha-monitor/metadata.xml
+++ b/www-apps/hiawatha-monitor/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>hasufell@gentoo.org</email>
</maintainer>
<upstream>
- <remote-id type='github'>hsleisink/monitor</remote-id>
+ <remote-id type="github">hsleisink/monitor</remote-id>
</upstream>
</pkgmetadata>
diff --git a/www-apps/horde-chora/metadata.xml b/www-apps/horde-chora/metadata.xml
index 60478682cdb4..cb01b3a5620c 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 type="project">
+ <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 105739700b78..d66835f6570c 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 19e58ab40b7d..2305b6929ae0 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 type="project">
+ <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 80a52651e16f..3ff6d2a8cc0b 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 type="project">
+ <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 7724759b556d..17abe19d55ee 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 23226ecc99a7..d2a8315e1702 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 type="project">
+ <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 6632069b5aff..2b9b44f73497 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 type="project">
+ <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 e842c3a05b62..241849445c01 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 type="project">
+ <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 0df3fe67cab1..f7ca0583ebe5 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 type="project">
+ <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 b3c1823c8d13..4fc989e4471b 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 type="project">
+ <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
@@ -13,7 +16,7 @@ command for smb/cifs password support, servuftp, vmailmgr, vpopmail, and
sql passwords.
</longdescription>
<use>
- <flag name='clearpasswd'>Enables cleartext password storage in the vpopmail
+ <flag name="clearpasswd">Enables cleartext password storage in the vpopmail
files</flag>
</use>
</pkgmetadata>
diff --git a/www-apps/horde-pear/metadata.xml b/www-apps/horde-pear/metadata.xml
index 449e031b5334..34252e892def 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 type="project">
+ <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 f39fa43df11f..2256e276e940 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 type="project">
+ <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 1f0aa4dd26bb..14d4b5adeb13 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 type="project">
+ <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/icingaweb2-module-pnp4nagios/metadata.xml b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
index d5dfd322223c..1301fb3341bc 100644
--- a/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
+++ b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
index ff36ae7481aa..1a95653552cb 100644
--- a/www-apps/icingaweb2/metadata.xml
+++ b/www-apps/icingaweb2/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/www-apps/ikiwiki/metadata.xml b/www-apps/ikiwiki/metadata.xml
index 1bc65c298edc..86a50d834cff 100644
--- a/www-apps/ikiwiki/metadata.xml
+++ b/www-apps/ikiwiki/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>alicef@gentoo.org</email>
<name>Alice Ferrazzi</name>
<description>Assign bugs to me.</description>
diff --git a/www-apps/jekyll-coffeescript/metadata.xml b/www-apps/jekyll-coffeescript/metadata.xml
index bd119c5459f3..c3348e696893 100644
--- a/www-apps/jekyll-coffeescript/metadata.xml
+++ b/www-apps/jekyll-coffeescript/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll-gist/metadata.xml b/www-apps/jekyll-gist/metadata.xml
index 8fbf833f2885..6a3f9cbbe5fd 100644
--- a/www-apps/jekyll-gist/metadata.xml
+++ b/www-apps/jekyll-gist/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll-paginate/metadata.xml b/www-apps/jekyll-paginate/metadata.xml
index d4d9a3671426..59f43040c978 100644
--- a/www-apps/jekyll-paginate/metadata.xml
+++ b/www-apps/jekyll-paginate/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll-sass-converter/metadata.xml b/www-apps/jekyll-sass-converter/metadata.xml
index 85f5da910996..45128602f538 100644
--- a/www-apps/jekyll-sass-converter/metadata.xml
+++ b/www-apps/jekyll-sass-converter/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll-sitemap/metadata.xml b/www-apps/jekyll-sitemap/metadata.xml
index 6f4e60144a48..ffb77cd967da 100644
--- a/www-apps/jekyll-sitemap/metadata.xml
+++ b/www-apps/jekyll-sitemap/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll-watch/metadata.xml b/www-apps/jekyll-watch/metadata.xml
index 1bf922dc3165..bd911e77a880 100644
--- a/www-apps/jekyll-watch/metadata.xml
+++ b/www-apps/jekyll-watch/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
index 159cb86f6181..fe2851f138f6 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 623cf9b6e892..8f87458fb922 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -1,22 +1,28 @@
<?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>
+ <maintainer type="person">
<email>harold@naparst.com</email>
<name>Harold Naparst</name>
<description>Primary proxied maintainer, set to assignee in all bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>oli.huber@gmail.com</email>
<name>Olivier Huber</name>
<description>Co Maintainer, CC bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer type="project">
+ <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 fe6f9ccf1a7e..2d4f80063279 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>
+ <maintainer type="person">
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/liquid_feedback_core/metadata.xml b/www-apps/liquid_feedback_core/metadata.xml
index d97438322755..6caeedfd5a1e 100644
--- a/www-apps/liquid_feedback_core/metadata.xml
+++ b/www-apps/liquid_feedback_core/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Alfredo Tupone</name>
</maintainer>
diff --git a/www-apps/liquid_feedback_frontend/metadata.xml b/www-apps/liquid_feedback_frontend/metadata.xml
index 1971333113c6..e022d4b7ea8d 100644
--- a/www-apps/liquid_feedback_frontend/metadata.xml
+++ b/www-apps/liquid_feedback_frontend/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Alfredo Tupone</name>
</maintainer>
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
index d50c1bef73f7..b1a40455a1f2 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 type="project">
+ <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 e5a305eb81c7..da782b3c4660 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>
+ <maintainer type="person">
<email>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
+ <maintainer type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+</maintainer>
</pkgmetadata>
diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml
index c9288a4839e6..08e8190d4fc7 100644
--- a/www-apps/mirmon/metadata.xml
+++ b/www-apps/mirmon/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
-<longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
+ <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
</pkgmetadata>
diff --git a/www-apps/mod_survey/metadata.xml b/www-apps/mod_survey/metadata.xml
index 6632069b5aff..2b9b44f73497 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 3cf0cd5be0b1..b42479a73f31 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>
+<maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+<maintainer type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 bbe97fab0a78..764a121355c6 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>
+ <maintainer type="person">
<email>cardoe@gentoo.org</email>
<description>Do not CC me on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>mythtv@gentoo.org</email>
+ <name>MythTV</name>
+ </maintainer>
+ <maintainer type="project">
+ <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 194b9f320e11..438e4ce281b4 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 type="project">
+ <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 3c43de11d5ec..9abf9c6b8ec2 100644
--- a/www-apps/nanoc/metadata.xml
+++ b/www-apps/nanoc/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>graaff@gentoo.org</email></maintainer>
-<herd>ruby</herd>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<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 84a1db7d3b19..7a0413c98119 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>
+ <maintainer type="person">
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
+ <maintainer type="project">
+ <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/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index dbdca4220697..99ec112ba67e 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/www-apps/openwebstats/metadata.xml b/www-apps/openwebstats/metadata.xml
index dc9438ea01a5..5551d3efd112 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 type="project">
+ <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 9e582f6b9b45..38448c9a8c7e 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,15 +1,20 @@
<?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>
+ <maintainer type="person">
<email>lists@xunil.at</email>
<name>Stefan Weichinger</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer type="project">
+ <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>
</pkgmetadata>
-
diff --git a/www-apps/owncloud/metadata.xml b/www-apps/owncloud/metadata.xml
index 6895c80555dc..6608c097e970 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>
+ <maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
+<maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/www-apps/ownpaste/metadata.xml b/www-apps/ownpaste/metadata.xml
index b452243522b4..e02a6833f99a 100644
--- a/www-apps/ownpaste/metadata.xml
+++ b/www-apps/ownpaste/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
diff --git a/www-apps/pcgi/metadata.xml b/www-apps/pcgi/metadata.xml
index 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 6632069b5aff..2b9b44f73497 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 type="project">
+ <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 f78e909e6c96..e438e02eb7aa 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 type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer type="project">
+ <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 44cdf35091f9..e2ac42934964 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 type="project">
+ <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 768048d28c6b..15b8d1f6508f 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 type="project">
+ <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 f04a5186b05c..cce709fb534c 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 type="project">
+ <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 95c06f0095bb..f2f2ba9e2823 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 type="project">
+ <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 6266de700fd8..b8dbc4c9c58b 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 type="project">
+ <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 11cefb5a384c..dc2a4519d327 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 type="project">
+ <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/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index 3f9c41831008..58bd3cc7ceef 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>matsuu@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
<longdescription lang="en">
</longdescription>
<use>
- <flag name='passenger'>Enable support for <pkg>www-apache/passenger</pkg></flag>
+ <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag>
</use>
</pkgmetadata>
-
diff --git a/www-apps/rocketwiki-lqfb/metadata.xml b/www-apps/rocketwiki-lqfb/metadata.xml
index bfa841b3dcf5..10420b57d80d 100644
--- a/www-apps/rocketwiki-lqfb/metadata.xml
+++ b/www-apps/rocketwiki-lqfb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Alfredo Tupone</name>
</maintainer>
@@ -9,4 +9,3 @@
RocketWiki is a small parser written in Haskell which translates a wiki dialect to HTML. It uses Parsec, a monadic parser combinator library. The compressed source code of RocketWiki has a size of only 5162 bytes.
</longdescription>
</pkgmetadata>
-
diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
index e75835f1ea4f..ccc27c8bd6b9 100644
--- a/www-apps/roundup/metadata.xml
+++ b/www-apps/roundup/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer type="project">
+ <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 1a61ca9bfee3..f1d1d6173dc8 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -1,16 +1,22 @@
<?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>
+ <maintainer type="person">
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>eric.joshua.martin@gmail.com</email>
<name>Eric Martin</name>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <maintainer type="project">
+ <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 53065a2d2338..80f67343220e 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/metadata.xml
@@ -1,9 +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>maintainer-needed@gentoo.org</email>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
</maintainer>
<upstream>
<remote-id type="google-code">rutorrent</remote-id>
diff --git a/www-apps/scgi/metadata.xml b/www-apps/scgi/metadata.xml
index 4538a68724a6..097975e3adc2 100644
--- a/www-apps/scgi/metadata.xml
+++ b/www-apps/scgi/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
index 2d3672bfffd8..bc8f9fcabf1a 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 type="project">
+ <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 a6e3b05753cf..d60ca14d2582 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer type="project">
+ <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-accountmanager/metadata.xml b/www-apps/trac-accountmanager/metadata.xml
index 96ad4fdf3737..efdc6f603a37 100644
--- a/www-apps/trac-accountmanager/metadata.xml
+++ b/www-apps/trac-accountmanager/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
diff --git a/www-apps/trac-downloads/metadata.xml b/www-apps/trac-downloads/metadata.xml
index 4e77b4b7ea2c..c194f2fc320f 100644
--- a/www-apps/trac-downloads/metadata.xml
+++ b/www-apps/trac-downloads/metadata.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
</pkgmetadata>
-
diff --git a/www-apps/trac-mercurial/metadata.xml b/www-apps/trac-mercurial/metadata.xml
index 344f9b5f2105..044adc47a484 100644
--- a/www-apps/trac-mercurial/metadata.xml
+++ b/www-apps/trac-mercurial/metadata.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
</pkgmetadata>
-
diff --git a/www-apps/trac-tags/metadata.xml b/www-apps/trac-tags/metadata.xml
index 4e77b4b7ea2c..c194f2fc320f 100644
--- a/www-apps/trac-tags/metadata.xml
+++ b/www-apps/trac-tags/metadata.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rafaelmartins@gentoo.org</email>
<name>Rafael G. Martins</name>
</maintainer>
</pkgmetadata>
-
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 01f0547d2d10..56eb0c0a14f4 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>
+ <maintainer type="person">
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+ <maintainer type="project">
+ <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/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 901fe7e11083..5a2d4a74d650 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
<description>Maintainer</description>
diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
index 6b3fc620a69e..b0b5f71b3e21 100644
--- a/www-apps/venus/metadata.xml
+++ b/www-apps/venus/metadata.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <maintainer>
+ <maintainer type="person">
<email>tampakrap@gentoo.org</email>
</maintainer>
+ <maintainer type="project">
+ <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>
<flag name="redland">Enable support for Redland RDF</flag>
</use>
</pkgmetadata>
-
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
index 15664488ccee..e3f695364293 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 type="project">
+ <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 d68a2a4f22b4..859b14f6878b 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/metadata.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>c.affolter@stepping-stone.ch</email>
<description>Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>dev-zero@gentoo.org</email>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <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/webmcp/metadata.xml b/www-apps/webmcp/metadata.xml
index 133931e024a5..4d19ee4003bb 100644
--- a/www-apps/webmcp/metadata.xml
+++ b/www-apps/webmcp/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Alfredo Tupone</name>
</maintainer>
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index e6d124be11a6..23492929dea5 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer type="project">
+ <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 81aa0dcdd197..c51eae6b19fe 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 type="project">
+ <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 c9b584fe6f2c..0f33ebeaad32 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 type="project">
+<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>