From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-880183-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 1B4EE1381F1
for <garchives@archives.gentoo.org>; Fri, 6 May 2016 07:59:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0EA3DE07BA;
Fri, 6 May 2016 07:59:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 99B70E07BA
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 07:59:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DDFCD33D3CF
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 07:59:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D45316
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 07:59:37 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1462521521.3bc35f466f90b36c76f72dde69f3f2809b618e11.ulm@gentoo>
Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
X-VCS-Repository: proj/nxml-gentoo-schemas
X-VCS-Files: metadata.rnc
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 3bc35f466f90b36c76f72dde69f3f2809b618e11
X-VCS-Branch: master
Date: Fri, 6 May 2016 07:59:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cb575566-1614-47e3-baf3-6f608a801f8c
X-Archives-Hash: 44f97d8fb881e5be1470708f9e8920bc
commit: 3bc35f466f90b36c76f72dde69f3f2809b618e11
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 07:58:41 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May 6 07:58:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3bc35f46
Update metadata.rnc from DTD.
metadata.rnc | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/metadata.rnc b/metadata.rnc
index 2ed65b0..3919793 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,12 +10,7 @@ attlist.catmetadata &=
pkgmetadata =
element pkgmetadata {
attlist.pkgmetadata,
- (maintainer
- | natural-name
- | longdescription
- | slots
- | use
- | upstream)*
+ (maintainer | longdescription | slots | use | upstream)*
}
attlist.pkgmetadata &=
[ a:defaultValue = "" ] attribute pkgname { text }?
@@ -30,9 +25,6 @@ maintainer =
attlist.maintainer &=
[ a:defaultValue = "unknown" ]
attribute type { "person" | "project" | "unknown" }?
-# Natural name for package, example: LibreOffice (for app-office/libreoffice)
-natural-name = element natural-name { attlist.natural-name, text }
-attlist.natural-name &= empty
# A long description of the package in freetext
longdescription =
element longdescription {
@@ -42,7 +34,10 @@ longdescription =
slots = element slots { attlist.slots, slot*, subslots? }
# A particular SLOT
slot = element slot { attlist.slot, text* }
-# name attribute holds the name of the SLOT, for sub-SLOTS use the subslots element
+# name attribute holds the name of the SLOT, for sub-SLOTS
+# use the subslots element. A slot name of '*' can be used to
+# indicate a single description applying to all the slots in which
+# case no other <slot/> elements may be present.
attlist.slot &= attribute name { text }
# The meaning of sub-SLOTs for the whole package
subslots = element subslots { attlist.subslots, text* }
@@ -71,7 +66,7 @@ changelog = element changelog { attlist.changelog, text }
attlist.changelog &= empty
# URL where the location of the upstream documentation can be found
doc = element doc { attlist.doc, text }
-attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
+attlist.doc &= [ a:defaultValue = "en" ] attribute lang { text }?
# location where to report bugs
# (may also be an email address prefixed with mailto:)
bugs-to = element bugs-to { attlist.bugs-to, text }
@@ -110,20 +105,22 @@ cat = element cat { attlist.cat, text }
attlist.cat &= empty
# Common attributes
-# the lang attribute, specifies the language of this tag. This is
-# only useful for descriptions of various kinds. If a tag with this
-# attribute is included there must be a description in the default
-# language "C" or "en", which is equivalent
-attlist.description &= [ a:defaultValue = "C" ] attribute lang { text }?
+# the lang attribute, specifies the language of this tag in the
+# form of a ISO 639-1 language code. This is only useful for
+# descriptions of various kinds. If a tag with this attribute is
+# included there must be a description in the default language "en"
+attlist.description &=
+ [ a:defaultValue = "en" ] attribute lang { text }?
attlist.longdescription &=
- [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.slots &= [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }?
+ [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.slots &= [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }?
# The restrict attribute, this attribute specifies restrictions on
# the applicability of tags on versions. The format of this attribute is
-# equal to the format of DEPEND lines in ebuilds. There is one special
-# value though: restrict="*". A tag that specifies this only applies if
-# there are no other tags that apply.
+# equal to the format of DEPEND lines in ebuilds. Only package
+# dependency specifications conforming to EAPI=0 syntax are allowed.
+# The dependency specification may only contain references to the
+# package itself and no other package.
#
# For required tags, there must be either an unrestricted version, or a
# version that is default restricted.