From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 17 Aug 2012 21:35:00 +0000 (-0700)
Subject: metadata.dtd: update to latest
X-Git-Tag: v2.2.0_alpha122~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=603cb116f857b59fd0f5ec04c5e0bce3db4b4f5d;p=portage.git

metadata.dtd: update to latest
---

diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd
index d97642a72..bd8306667 100644
--- a/cnf/metadata.dtd
+++ b/cnf/metadata.dtd
@@ -5,7 +5,7 @@
 <!ATTLIST catmetadata pkgname CDATA "">
 
 <!-- Metadata for a package -->
-<!ELEMENT pkgmetadata ( (herd|maintainer|longdescription|use|upstream)* )>
+<!ELEMENT pkgmetadata ( (herd|maintainer|natural-name|longdescription|use|upstream)* )>
 <!ATTLIST pkgmetadata pkgname CDATA "">
 
   <!-- One tag for each herd this package is assigned to. -->
@@ -14,6 +14,9 @@
   <!-- One tag for each maintainer of a package, multiple allowed-->
   <!ELEMENT maintainer ( email, (description| name)* )>
 
+  <!-- Natural name for package, example: LibreOffice (for app-office/libreoffice) -->
+  <!ELEMENT natural-name (#PCDATA) >
+
   <!-- A long description of the package in freetext-->
   <!ELEMENT longdescription (#PCDATA|pkg|cat)* >
 
@@ -61,7 +64,7 @@
     <!ELEMENT bugs-to (#PCDATA)>
     <!-- specify a type of package identification tracker -->
     <!ELEMENT remote-id (#PCDATA)>
-      <!ATTLIST remote-id type (freshmeat|sourceforge|sourceforge-jp|cpan|vim|google-code|ctan|pypi|rubyforge|cran) #REQUIRED>
+      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cran|ctan|freshmeat|github|gitorious|google-code|launchpad|pear|pecl|pypi|rubyforge|rubygems|sourceforge|sourceforge-jp|vim) #REQUIRED>
 
   <!-- category/package information for cross-linking in descriptions
     and useflag descriptions -->