| 1 |
commit: 3bc35f466f90b36c76f72dde69f3f2809b618e11 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 6 07:58:41 2016 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 6 07:58:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3bc35f46 |
| 7 |
|
| 8 |
Update metadata.rnc from DTD. |
| 9 |
|
| 10 |
metadata.rnc | 41 +++++++++++++++++++---------------------- |
| 11 |
1 file changed, 19 insertions(+), 22 deletions(-) |
| 12 |
|
| 13 |
diff --git a/metadata.rnc b/metadata.rnc |
| 14 |
index 2ed65b0..3919793 100644 |
| 15 |
--- a/metadata.rnc |
| 16 |
+++ b/metadata.rnc |
| 17 |
@@ -10,12 +10,7 @@ attlist.catmetadata &= |
| 18 |
pkgmetadata = |
| 19 |
element pkgmetadata { |
| 20 |
attlist.pkgmetadata, |
| 21 |
- (maintainer |
| 22 |
- | natural-name |
| 23 |
- | longdescription |
| 24 |
- | slots |
| 25 |
- | use |
| 26 |
- | upstream)* |
| 27 |
+ (maintainer | longdescription | slots | use | upstream)* |
| 28 |
} |
| 29 |
attlist.pkgmetadata &= |
| 30 |
[ a:defaultValue = "" ] attribute pkgname { text }? |
| 31 |
@@ -30,9 +25,6 @@ maintainer = |
| 32 |
attlist.maintainer &= |
| 33 |
[ a:defaultValue = "unknown" ] |
| 34 |
attribute type { "person" | "project" | "unknown" }? |
| 35 |
-# Natural name for package, example: LibreOffice (for app-office/libreoffice) |
| 36 |
-natural-name = element natural-name { attlist.natural-name, text } |
| 37 |
-attlist.natural-name &= empty |
| 38 |
# A long description of the package in freetext |
| 39 |
longdescription = |
| 40 |
element longdescription { |
| 41 |
@@ -42,7 +34,10 @@ longdescription = |
| 42 |
slots = element slots { attlist.slots, slot*, subslots? } |
| 43 |
# A particular SLOT |
| 44 |
slot = element slot { attlist.slot, text* } |
| 45 |
-# name attribute holds the name of the SLOT, for sub-SLOTS use the subslots element |
| 46 |
+# name attribute holds the name of the SLOT, for sub-SLOTS |
| 47 |
+# use the subslots element. A slot name of '*' can be used to |
| 48 |
+# indicate a single description applying to all the slots in which |
| 49 |
+# case no other <slot/> elements may be present. |
| 50 |
attlist.slot &= attribute name { text } |
| 51 |
# The meaning of sub-SLOTs for the whole package |
| 52 |
subslots = element subslots { attlist.subslots, text* } |
| 53 |
@@ -71,7 +66,7 @@ changelog = element changelog { attlist.changelog, text } |
| 54 |
attlist.changelog &= empty |
| 55 |
# URL where the location of the upstream documentation can be found |
| 56 |
doc = element doc { attlist.doc, text } |
| 57 |
-attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }? |
| 58 |
+attlist.doc &= [ a:defaultValue = "en" ] attribute lang { text }? |
| 59 |
# location where to report bugs |
| 60 |
# (may also be an email address prefixed with mailto:) |
| 61 |
bugs-to = element bugs-to { attlist.bugs-to, text } |
| 62 |
@@ -110,20 +105,22 @@ cat = element cat { attlist.cat, text } |
| 63 |
attlist.cat &= empty |
| 64 |
# Common attributes |
| 65 |
|
| 66 |
-# the lang attribute, specifies the language of this tag. This is |
| 67 |
-# only useful for descriptions of various kinds. If a tag with this |
| 68 |
-# attribute is included there must be a description in the default |
| 69 |
-# language "C" or "en", which is equivalent |
| 70 |
-attlist.description &= [ a:defaultValue = "C" ] attribute lang { text }? |
| 71 |
+# the lang attribute, specifies the language of this tag in the |
| 72 |
+# form of a ISO 639-1 language code. This is only useful for |
| 73 |
+# descriptions of various kinds. If a tag with this attribute is |
| 74 |
+# included there must be a description in the default language "en" |
| 75 |
+attlist.description &= |
| 76 |
+ [ a:defaultValue = "en" ] attribute lang { text }? |
| 77 |
attlist.longdescription &= |
| 78 |
- [ a:defaultValue = "C" ] attribute lang { text }? |
| 79 |
-attlist.slots &= [ a:defaultValue = "C" ] attribute lang { text }? |
| 80 |
-attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }? |
| 81 |
+ [ a:defaultValue = "en" ] attribute lang { text }? |
| 82 |
+attlist.slots &= [ a:defaultValue = "en" ] attribute lang { text }? |
| 83 |
+attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }? |
| 84 |
# The restrict attribute, this attribute specifies restrictions on |
| 85 |
# the applicability of tags on versions. The format of this attribute is |
| 86 |
-# equal to the format of DEPEND lines in ebuilds. There is one special |
| 87 |
-# value though: restrict="*". A tag that specifies this only applies if |
| 88 |
-# there are no other tags that apply. |
| 89 |
+# equal to the format of DEPEND lines in ebuilds. Only package |
| 90 |
+# dependency specifications conforming to EAPI=0 syntax are allowed. |
| 91 |
+# The dependency specification may only contain references to the |
| 92 |
+# package itself and no other package. |
| 93 |
# |
| 94 |
# For required tags, there must be either an unrestricted version, or a |
| 95 |
# version that is default restricted. |
Archives