[gentoo-commits] data/xml-schema:master commit in: /

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     d9fe77eac622d43629d9eb0aa79d9fa93c909cba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 12:16:07 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 12:28:37 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=d9fe77ea

metadata.xsd: Support FTP URLs

Base urlType on xs:anyURI. Slightly simplify the mailto syntax (a dot
in the domain part is actually not required).

Closes: https://bugs.gentoo.org/830211
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index d2e3d4f..1a86051 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -553,9 +553,9 @@
 	</xs:complexType>
 
 	<xs:simpleType name='urlType'>
-		<xs:restriction base='xs:token'>
+		<xs:restriction base='xs:anyURI'>
 			<!-- TODO: something better? -->
-			<xs:pattern value="(mailto:[^@]+@[^.\s]+\.\S+|https?://\S+)"/>
+			<xs:pattern value="(mailto:.+@.+|(ftp|https?)://\S+)"/>
 		</xs:restriction>
 	</xs:simpleType>
 

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     db829cfdb40ae0a0034848cce38ee741a7c8d68c
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Sep 14 09:37:38 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 15:47:42 2023 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=db829cfd

metadata.xsd: add codeberg remote-id

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index a9a7963..cf8485d 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -271,6 +271,7 @@
 	<xs:simpleType name='upstreamRemoteIdTypeAttrType'>
 		<xs:restriction base='xs:token'>
 			<xs:enumeration value='bitbucket'/>
+			<xs:enumeration value='codeberg'/>
 			<xs:enumeration value='cpan'/>
 			<xs:enumeration value='cpan-module'/>
 			<xs:enumeration value='cpe'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     84d4fe3e11bc21c3d5742be1a04ba0df33c7bd0c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 21:31:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:32:00 2023 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=84d4fe3e

metadata.xsd: add kde-invent remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 3812045..a9a7963 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -284,6 +284,7 @@
 			<xs:enumeration value='google-code'/>
 			<xs:enumeration value='hackage'/>
 			<xs:enumeration value='heptapod'/>
+			<xs:enumeration value='kde-invent'/>
 			<xs:enumeration value='launchpad'/>
 			<xs:enumeration value='osdn'/>
 			<xs:enumeration value='pear'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     1fc2d92b221751b349d8ca89d8838de8cb88d76e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 01:57:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 01:57:11 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=1fc2d92b

metadata.xsd: add savannah, savannah-nongnu remote-ids

Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metadata.xsd b/metadata.xsd
index b485526..3812045 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -290,6 +290,8 @@
 			<xs:enumeration value='pecl'/>
 			<xs:enumeration value='pypi'/>
 			<xs:enumeration value='rubygems'/>
+			<xs:enumeration value='savannah'/>
+			<xs:enumeration value='savannah-nongnu'/>
 			<xs:enumeration value='sourceforge'/>
 			<xs:enumeration value='sourcehut'/>
 			<xs:enumeration value='vim'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     03e792894a2a45949ce6a542d233d91af079c4e9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 19:15:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 20:02:47 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=03e79289

metadata.xsd: Add freedestkop-gitlab remote-id

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 303b57f..b485526 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -276,6 +276,7 @@
 			<xs:enumeration value='cpe'/>
 			<xs:enumeration value='cran'/>
 			<xs:enumeration value='ctan'/>
+			<xs:enumeration value='freedesktop-gitlab'/>
 			<xs:enumeration value='gentoo'/>
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     85acd4adfd9ae6f6d361131dbf5a07f3ad6da4da
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 19:14:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 20:02:47 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=85acd4ad

metadata.xsd: Add gnome-gitlab remote-id

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 87972cb..303b57f 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -279,6 +279,7 @@
 			<xs:enumeration value='gentoo'/>
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
+			<xs:enumeration value='gnome-gitlab'/>
 			<xs:enumeration value='google-code'/>
 			<xs:enumeration value='hackage'/>
 			<xs:enumeration value='heptapod'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     16f943836b5e17b0802d15f68f9fada0398b96e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 01:44:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 01:44:27 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=16f94383

metadata.xsd: add sourcehut remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index b125e57..d721a62 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -288,6 +288,7 @@
 			<xs:enumeration value='pypi'/>
 			<xs:enumeration value='rubygems'/>
 			<xs:enumeration value='sourceforge'/>
+			<xs:enumeration value='sourcehut'/>
 			<xs:enumeration value='vim'/>
 		</xs:restriction>
 	</xs:simpleType>

[gentoo-commits] data/xml-schema:master commit in: /

[Sam James]

commit:     d07cde98cc4af6e85a518d86478ad193d7465771
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 20:13:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 20:13:00 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=d07cde98

metadata.xsd: add hackage remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index d721a62..87972cb 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -280,6 +280,7 @@
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
 			<xs:enumeration value='google-code'/>
+			<xs:enumeration value='hackage'/>
 			<xs:enumeration value='heptapod'/>
 			<xs:enumeration value='launchpad'/>
 			<xs:enumeration value='osdn'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     d17aa632ab7f3b9373a15911d7d0c5da6e83ea95
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 10:09:56 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 25 10:09:56 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=d17aa632

metadata.xsd: Drop obsolete gitorious remote-id type

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.xsd b/metadata.xsd
index 439f940..b125e57 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -279,7 +279,6 @@
 			<xs:enumeration value='gentoo'/>
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
-			<xs:enumeration value='gitorious'/>
 			<xs:enumeration value='google-code'/>
 			<xs:enumeration value='heptapod'/>
 			<xs:enumeration value='launchpad'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     a964a345cbdcd6614fbcdd53734d41e471801415
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 20:09:09 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 23 20:09:09 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=a964a345

metadata.xsd: Drop obsolete sourceforge-jp remote-id type

This has been renamed to osdn, see commit 4b5fede.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.xsd b/metadata.xsd
index a355e54..439f940 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -289,7 +289,6 @@
 			<xs:enumeration value='pypi'/>
 			<xs:enumeration value='rubygems'/>
 			<xs:enumeration value='sourceforge'/>
-			<xs:enumeration value='sourceforge-jp'/>
 			<xs:enumeration value='vim'/>
 		</xs:restriction>
 	</xs:simpleType>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     4b5fede82e289d504afdb56a882befa5d289be26
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:45:37 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 23 10:45:37 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=4b5fede8

metadata.xsd: Add osdn remote-id type

This follows renaming of SourceForge.JP to OSDN (in 2015).
The sourceforge-jp remote-id type will be removed later.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 51fd09f..a355e54 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -283,6 +283,7 @@
 			<xs:enumeration value='google-code'/>
 			<xs:enumeration value='heptapod'/>
 			<xs:enumeration value='launchpad'/>
+			<xs:enumeration value='osdn'/>
 			<xs:enumeration value='pear'/>
 			<xs:enumeration value='pecl'/>
 			<xs:enumeration value='pypi'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     81a35d273a70b539a2c53fd06e9ef833557391e9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:41:50 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 23 10:41:50 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=81a35d27

metadata.xsd: Drop obsolete remote-id types

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 40e230e..8e77f06 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -276,8 +276,6 @@
 			<xs:enumeration value='cpe'/>
 			<xs:enumeration value='cran'/>
 			<xs:enumeration value='ctan'/>
-			<xs:enumeration value='freecode'/>
-			<xs:enumeration value='freshmeat'/>
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
 			<xs:enumeration value='gitorious'/>
@@ -287,7 +285,6 @@
 			<xs:enumeration value='pear'/>
 			<xs:enumeration value='pecl'/>
 			<xs:enumeration value='pypi'/>
-			<xs:enumeration value='rubyforge'/>
 			<xs:enumeration value='rubygems'/>
 			<xs:enumeration value='sourceforge'/>
 			<xs:enumeration value='sourceforge-jp'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     623c7bd56d464e628bbd13966129aa7e3c108285
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:42:28 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 23 10:42:28 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=623c7bd5

metadata.xsd: Add gentoo remote-id type

This follows an earlier update of the DTD, commit f265dac
in data/dtd.git.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 8e77f06..51fd09f 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -276,6 +276,7 @@
 			<xs:enumeration value='cpe'/>
 			<xs:enumeration value='cran'/>
 			<xs:enumeration value='ctan'/>
+			<xs:enumeration value='gentoo'/>
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
 			<xs:enumeration value='gitorious'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     a1cea02313b2f53a79dfb819f14f4970f1d1781b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 05:33:02 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 22 06:09:21 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=a1cea023

repositories.xsd: Use xs:language for lang attributes

Use a built-in datatype of XML Schema instead of hand-crafting our own.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 repositories.xsd | 214 +------------------------------------------------------
 1 file changed, 1 insertion(+), 213 deletions(-)

diff --git a/repositories.xsd b/repositories.xsd
index 8454c7a..be4ce20 100644
--- a/repositories.xsd
+++ b/repositories.xsd
@@ -55,7 +55,7 @@
 	<xs:complexType name='descriptionType'>
 		<xs:simpleContent>
 			<xs:extension base='xs:token'>
-				<xs:attribute name='lang' type='langAttrType' default='en'/>
+				<xs:attribute name='lang' type='xs:language' default='en'/>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -81,218 +81,6 @@
 	</xs:complexType>
 
 	<!-- attributes -->
-	<xs:simpleType name='langAttrType'>
-		<xs:restriction base='xs:token'>
-			<!-- ISO 639-1 language codes -->
-			<xs:enumeration value='aa'/>
-			<xs:enumeration value='ab'/>
-			<xs:enumeration value='ae'/>
-			<xs:enumeration value='af'/>
-			<xs:enumeration value='ak'/>
-			<xs:enumeration value='am'/>
-			<xs:enumeration value='an'/>
-			<xs:enumeration value='ar'/>
-			<xs:enumeration value='as'/>
-			<xs:enumeration value='av'/>
-			<xs:enumeration value='ay'/>
-			<xs:enumeration value='az'/>
-			<xs:enumeration value='ba'/>
-			<xs:enumeration value='be'/>
-			<xs:enumeration value='bg'/>
-			<xs:enumeration value='bh'/>
-			<xs:enumeration value='bi'/>
-			<xs:enumeration value='bm'/>
-			<xs:enumeration value='bn'/>
-			<xs:enumeration value='bo'/>
-			<xs:enumeration value='bo'/>
-			<xs:enumeration value='br'/>
-			<xs:enumeration value='bs'/>
-			<xs:enumeration value='ca'/>
-			<xs:enumeration value='ce'/>
-			<xs:enumeration value='ch'/>
-			<xs:enumeration value='co'/>
-			<xs:enumeration value='cr'/>
-			<xs:enumeration value='cs'/>
-			<xs:enumeration value='cs'/>
-			<xs:enumeration value='cu'/>
-			<xs:enumeration value='cv'/>
-			<xs:enumeration value='cy'/>
-			<xs:enumeration value='cy'/>
-			<xs:enumeration value='da'/>
-			<xs:enumeration value='de'/>
-			<xs:enumeration value='de'/>
-			<xs:enumeration value='dv'/>
-			<xs:enumeration value='dz'/>
-			<xs:enumeration value='ee'/>
-			<xs:enumeration value='el'/>
-			<xs:enumeration value='el'/>
-			<xs:enumeration value='en'/>
-			<xs:enumeration value='eo'/>
-			<xs:enumeration value='es'/>
-			<xs:enumeration value='et'/>
-			<xs:enumeration value='eu'/>
-			<xs:enumeration value='eu'/>
-			<xs:enumeration value='fa'/>
-			<xs:enumeration value='fa'/>
-			<xs:enumeration value='ff'/>
-			<xs:enumeration value='fi'/>
-			<xs:enumeration value='fj'/>
-			<xs:enumeration value='fo'/>
-			<xs:enumeration value='fr'/>
-			<xs:enumeration value='fr'/>
-			<xs:enumeration value='fy'/>
-			<xs:enumeration value='ga'/>
-			<xs:enumeration value='ga'/>
-			<xs:enumeration value='Ga'/>
-			<xs:enumeration value='gd'/>
-			<xs:enumeration value='gl'/>
-			<xs:enumeration value='gn'/>
-			<xs:enumeration value='gu'/>
-			<xs:enumeration value='gv'/>
-			<xs:enumeration value='ha'/>
-			<xs:enumeration value='he'/>
-			<xs:enumeration value='hi'/>
-			<xs:enumeration value='ho'/>
-			<xs:enumeration value='hr'/>
-			<xs:enumeration value='ht'/>
-			<xs:enumeration value='hu'/>
-			<xs:enumeration value='hy'/>
-			<xs:enumeration value='hy'/>
-			<xs:enumeration value='hz'/>
-			<xs:enumeration value='ia'/>
-			<xs:enumeration value='id'/>
-			<xs:enumeration value='ie'/>
-			<xs:enumeration value='ig'/>
-			<xs:enumeration value='ii'/>
-			<xs:enumeration value='ik'/>
-			<xs:enumeration value='io'/>
-			<xs:enumeration value='is'/>
-			<xs:enumeration value='is'/>
-			<xs:enumeration value='it'/>
-			<xs:enumeration value='iu'/>
-			<xs:enumeration value='ja'/>
-			<xs:enumeration value='jv'/>
-			<xs:enumeration value='ka'/>
-			<xs:enumeration value='ka'/>
-			<xs:enumeration value='kg'/>
-			<xs:enumeration value='ki'/>
-			<xs:enumeration value='kj'/>
-			<xs:enumeration value='kk'/>
-			<xs:enumeration value='kl'/>
-			<xs:enumeration value='km'/>
-			<xs:enumeration value='kn'/>
-			<xs:enumeration value='ko'/>
-			<xs:enumeration value='kr'/>
-			<xs:enumeration value='ks'/>
-			<xs:enumeration value='ku'/>
-			<xs:enumeration value='kv'/>
-			<xs:enumeration value='kw'/>
-			<xs:enumeration value='ky'/>
-			<xs:enumeration value='la'/>
-			<xs:enumeration value='lb'/>
-			<xs:enumeration value='lg'/>
-			<xs:enumeration value='li'/>
-			<xs:enumeration value='ln'/>
-			<xs:enumeration value='lo'/>
-			<xs:enumeration value='lt'/>
-			<xs:enumeration value='lu'/>
-			<xs:enumeration value='lv'/>
-			<xs:enumeration value='mg'/>
-			<xs:enumeration value='mh'/>
-			<xs:enumeration value='mi'/>
-			<xs:enumeration value='mi'/>
-			<xs:enumeration value='mk'/>
-			<xs:enumeration value='mk'/>
-			<xs:enumeration value='ml'/>
-			<xs:enumeration value='mn'/>
-			<xs:enumeration value='mr'/>
-			<xs:enumeration value='ms'/>
-			<xs:enumeration value='ms'/>
-			<xs:enumeration value='mt'/>
-			<xs:enumeration value='my'/>
-			<xs:enumeration value='my'/>
-			<xs:enumeration value='na'/>
-			<xs:enumeration value='nb'/>
-			<xs:enumeration value='nd'/>
-			<xs:enumeration value='ne'/>
-			<xs:enumeration value='ng'/>
-			<xs:enumeration value='nl'/>
-			<xs:enumeration value='nl'/>
-			<xs:enumeration value='nn'/>
-			<xs:enumeration value='no'/>
-			<xs:enumeration value='nr'/>
-			<xs:enumeration value='nv'/>
-			<xs:enumeration value='ny'/>
-			<xs:enumeration value='oc'/>
-			<xs:enumeration value='oj'/>
-			<xs:enumeration value='om'/>
-			<xs:enumeration value='or'/>
-			<xs:enumeration value='os'/>
-			<xs:enumeration value='pa'/>
-			<xs:enumeration value='pi'/>
-			<xs:enumeration value='pl'/>
-			<xs:enumeration value='ps'/>
-			<xs:enumeration value='pt'/>
-			<xs:enumeration value='qu'/>
-			<xs:enumeration value='rm'/>
-			<xs:enumeration value='rn'/>
-			<xs:enumeration value='ro'/>
-			<xs:enumeration value='ro'/>
-			<xs:enumeration value='ru'/>
-			<xs:enumeration value='rw'/>
-			<xs:enumeration value='sa'/>
-			<xs:enumeration value='sc'/>
-			<xs:enumeration value='sd'/>
-			<xs:enumeration value='se'/>
-			<xs:enumeration value='sg'/>
-			<xs:enumeration value='si'/>
-			<xs:enumeration value='sk'/>
-			<xs:enumeration value='sk'/>
-			<xs:enumeration value='sl'/>
-			<xs:enumeration value='sm'/>
-			<xs:enumeration value='sn'/>
-			<xs:enumeration value='so'/>
-			<xs:enumeration value='sq'/>
-			<xs:enumeration value='sq'/>
-			<xs:enumeration value='sr'/>
-			<xs:enumeration value='ss'/>
-			<xs:enumeration value='st'/>
-			<xs:enumeration value='su'/>
-			<xs:enumeration value='sv'/>
-			<xs:enumeration value='sw'/>
-			<xs:enumeration value='ta'/>
-			<xs:enumeration value='te'/>
-			<xs:enumeration value='tg'/>
-			<xs:enumeration value='th'/>
-			<xs:enumeration value='ti'/>
-			<xs:enumeration value='tk'/>
-			<xs:enumeration value='tl'/>
-			<xs:enumeration value='tn'/>
-			<xs:enumeration value='to'/>
-			<xs:enumeration value='tr'/>
-			<xs:enumeration value='ts'/>
-			<xs:enumeration value='tt'/>
-			<xs:enumeration value='tw'/>
-			<xs:enumeration value='ty'/>
-			<xs:enumeration value='ug'/>
-			<xs:enumeration value='uk'/>
-			<xs:enumeration value='ur'/>
-			<xs:enumeration value='uz'/>
-			<xs:enumeration value='ve'/>
-			<xs:enumeration value='vi'/>
-			<xs:enumeration value='vo'/>
-			<xs:enumeration value='wa'/>
-			<xs:enumeration value='wo'/>
-			<xs:enumeration value='xh'/>
-			<xs:enumeration value='yi'/>
-			<xs:enumeration value='yo'/>
-			<xs:enumeration value='za'/>
-			<xs:enumeration value='zh'/>
-			<xs:enumeration value='zh'/>
-			<xs:enumeration value='zu'/>
-		</xs:restriction>
-	</xs:simpleType>
-	
 	<xs:simpleType name='repoQualityAttrType'>
 		<xs:restriction base='xs:token'>
 			<xs:enumeration value='core'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     197c545067748a1ecf6b371d3646a3e725923264
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 05:32:05 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 22 06:09:14 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=197c5450

metadata.xsd: Use xs:language for lang attributes

Use a built-in datatype of XML Schema instead of hand-crafting our own.

Bug: https://bugs.gentoo.org/578294
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 metadata.xsd | 224 ++---------------------------------------------------------
 1 file changed, 6 insertions(+), 218 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 1a86051..40e230e 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -170,7 +170,7 @@
 	<xs:complexType name='maintainerDescType'>
 		<xs:simpleContent>
 			<xs:extension base="xs:token">
-				<xs:attribute name='lang' type='langAttrType' default='en'/>
+				<xs:attribute name='lang' type='xs:language' default='en'/>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -181,7 +181,7 @@
 			<xs:element name='pkg' type='pkgType'/>
 			<xs:element name='cat' type='catType'/>
 		</xs:choice>
-		<xs:attribute name='lang' type='langAttrType' default='en'/>
+		<xs:attribute name='lang' type='xs:language' default='en'/>
 		<xs:attribute name='restrict' type='restrictAttrType' default=''/>
 	</xs:complexType>
 
@@ -190,7 +190,7 @@
 			<xs:element name='pkg' type='pkgType'/>
 			<xs:element name='cat' type='catType'/>
 		</xs:choice>
-		<xs:attribute name='lang' type='langAttrType' default='en'/>
+		<xs:attribute name='lang' type='xs:language' default='en'/>
 	</xs:complexType>
 
 	<!-- slots -->
@@ -199,7 +199,7 @@
 			<xs:element name='slot' type='slotType'/>
 			<xs:element name='subslots' type='tokenOnceType'/>
 		</xs:choice>
-		<xs:attribute name='lang' type='langAttrType' default='en'/>
+		<xs:attribute name='lang' type='xs:language' default='en'/>
 	</xs:complexType>
 
 	<xs:complexType name='slotType'>
@@ -229,7 +229,7 @@
 		<xs:choice minOccurs='0' maxOccurs='unbounded'>
 			<xs:element name='flag' type='flagType'/>
 		</xs:choice>
-		<xs:attribute name='lang' type='langAttrType' default='en'/>
+		<xs:attribute name='lang' type='xs:language' default='en'/>
 	</xs:complexType>
 
 	<xs:complexType name='flagType' mixed='true'>
@@ -254,7 +254,7 @@
 	<xs:complexType name='upstreamDocType'>
 		<xs:simpleContent>
 			<xs:extension base="urlType">
-				<xs:attribute name='lang' type='langAttrType' default='en'/>
+				<xs:attribute name='lang' type='xs:language' default='en'/>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -313,218 +313,6 @@
 	</xs:simpleType>
 
 	<!-- common attributes -->
-	<xs:simpleType name='langAttrType'>
-		<xs:restriction base='xs:token'>
-			<!-- ISO 639-1 language codes -->
-			<xs:enumeration value='aa'/>
-			<xs:enumeration value='ab'/>
-			<xs:enumeration value='ae'/>
-			<xs:enumeration value='af'/>
-			<xs:enumeration value='ak'/>
-			<xs:enumeration value='am'/>
-			<xs:enumeration value='an'/>
-			<xs:enumeration value='ar'/>
-			<xs:enumeration value='as'/>
-			<xs:enumeration value='av'/>
-			<xs:enumeration value='ay'/>
-			<xs:enumeration value='az'/>
-			<xs:enumeration value='ba'/>
-			<xs:enumeration value='be'/>
-			<xs:enumeration value='bg'/>
-			<xs:enumeration value='bh'/>
-			<xs:enumeration value='bi'/>
-			<xs:enumeration value='bm'/>
-			<xs:enumeration value='bn'/>
-			<xs:enumeration value='bo'/>
-			<xs:enumeration value='bo'/>
-			<xs:enumeration value='br'/>
-			<xs:enumeration value='bs'/>
-			<xs:enumeration value='ca'/>
-			<xs:enumeration value='ce'/>
-			<xs:enumeration value='ch'/>
-			<xs:enumeration value='co'/>
-			<xs:enumeration value='cr'/>
-			<xs:enumeration value='cs'/>
-			<xs:enumeration value='cs'/>
-			<xs:enumeration value='cu'/>
-			<xs:enumeration value='cv'/>
-			<xs:enumeration value='cy'/>
-			<xs:enumeration value='cy'/>
-			<xs:enumeration value='da'/>
-			<xs:enumeration value='de'/>
-			<xs:enumeration value='de'/>
-			<xs:enumeration value='dv'/>
-			<xs:enumeration value='dz'/>
-			<xs:enumeration value='ee'/>
-			<xs:enumeration value='el'/>
-			<xs:enumeration value='el'/>
-			<xs:enumeration value='en'/>
-			<xs:enumeration value='eo'/>
-			<xs:enumeration value='es'/>
-			<xs:enumeration value='et'/>
-			<xs:enumeration value='eu'/>
-			<xs:enumeration value='eu'/>
-			<xs:enumeration value='fa'/>
-			<xs:enumeration value='fa'/>
-			<xs:enumeration value='ff'/>
-			<xs:enumeration value='fi'/>
-			<xs:enumeration value='fj'/>
-			<xs:enumeration value='fo'/>
-			<xs:enumeration value='fr'/>
-			<xs:enumeration value='fr'/>
-			<xs:enumeration value='fy'/>
-			<xs:enumeration value='ga'/>
-			<xs:enumeration value='ga'/>
-			<xs:enumeration value='Ga'/>
-			<xs:enumeration value='gd'/>
-			<xs:enumeration value='gl'/>
-			<xs:enumeration value='gn'/>
-			<xs:enumeration value='gu'/>
-			<xs:enumeration value='gv'/>
-			<xs:enumeration value='ha'/>
-			<xs:enumeration value='he'/>
-			<xs:enumeration value='hi'/>
-			<xs:enumeration value='ho'/>
-			<xs:enumeration value='hr'/>
-			<xs:enumeration value='ht'/>
-			<xs:enumeration value='hu'/>
-			<xs:enumeration value='hy'/>
-			<xs:enumeration value='hy'/>
-			<xs:enumeration value='hz'/>
-			<xs:enumeration value='ia'/>
-			<xs:enumeration value='id'/>
-			<xs:enumeration value='ie'/>
-			<xs:enumeration value='ig'/>
-			<xs:enumeration value='ii'/>
-			<xs:enumeration value='ik'/>
-			<xs:enumeration value='io'/>
-			<xs:enumeration value='is'/>
-			<xs:enumeration value='is'/>
-			<xs:enumeration value='it'/>
-			<xs:enumeration value='iu'/>
-			<xs:enumeration value='ja'/>
-			<xs:enumeration value='jv'/>
-			<xs:enumeration value='ka'/>
-			<xs:enumeration value='ka'/>
-			<xs:enumeration value='kg'/>
-			<xs:enumeration value='ki'/>
-			<xs:enumeration value='kj'/>
-			<xs:enumeration value='kk'/>
-			<xs:enumeration value='kl'/>
-			<xs:enumeration value='km'/>
-			<xs:enumeration value='kn'/>
-			<xs:enumeration value='ko'/>
-			<xs:enumeration value='kr'/>
-			<xs:enumeration value='ks'/>
-			<xs:enumeration value='ku'/>
-			<xs:enumeration value='kv'/>
-			<xs:enumeration value='kw'/>
-			<xs:enumeration value='ky'/>
-			<xs:enumeration value='la'/>
-			<xs:enumeration value='lb'/>
-			<xs:enumeration value='lg'/>
-			<xs:enumeration value='li'/>
-			<xs:enumeration value='ln'/>
-			<xs:enumeration value='lo'/>
-			<xs:enumeration value='lt'/>
-			<xs:enumeration value='lu'/>
-			<xs:enumeration value='lv'/>
-			<xs:enumeration value='mg'/>
-			<xs:enumeration value='mh'/>
-			<xs:enumeration value='mi'/>
-			<xs:enumeration value='mi'/>
-			<xs:enumeration value='mk'/>
-			<xs:enumeration value='mk'/>
-			<xs:enumeration value='ml'/>
-			<xs:enumeration value='mn'/>
-			<xs:enumeration value='mr'/>
-			<xs:enumeration value='ms'/>
-			<xs:enumeration value='ms'/>
-			<xs:enumeration value='mt'/>
-			<xs:enumeration value='my'/>
-			<xs:enumeration value='my'/>
-			<xs:enumeration value='na'/>
-			<xs:enumeration value='nb'/>
-			<xs:enumeration value='nd'/>
-			<xs:enumeration value='ne'/>
-			<xs:enumeration value='ng'/>
-			<xs:enumeration value='nl'/>
-			<xs:enumeration value='nl'/>
-			<xs:enumeration value='nn'/>
-			<xs:enumeration value='no'/>
-			<xs:enumeration value='nr'/>
-			<xs:enumeration value='nv'/>
-			<xs:enumeration value='ny'/>
-			<xs:enumeration value='oc'/>
-			<xs:enumeration value='oj'/>
-			<xs:enumeration value='om'/>
-			<xs:enumeration value='or'/>
-			<xs:enumeration value='os'/>
-			<xs:enumeration value='pa'/>
-			<xs:enumeration value='pi'/>
-			<xs:enumeration value='pl'/>
-			<xs:enumeration value='ps'/>
-			<xs:enumeration value='pt'/>
-			<xs:enumeration value='qu'/>
-			<xs:enumeration value='rm'/>
-			<xs:enumeration value='rn'/>
-			<xs:enumeration value='ro'/>
-			<xs:enumeration value='ro'/>
-			<xs:enumeration value='ru'/>
-			<xs:enumeration value='rw'/>
-			<xs:enumeration value='sa'/>
-			<xs:enumeration value='sc'/>
-			<xs:enumeration value='sd'/>
-			<xs:enumeration value='se'/>
-			<xs:enumeration value='sg'/>
-			<xs:enumeration value='si'/>
-			<xs:enumeration value='sk'/>
-			<xs:enumeration value='sk'/>
-			<xs:enumeration value='sl'/>
-			<xs:enumeration value='sm'/>
-			<xs:enumeration value='sn'/>
-			<xs:enumeration value='so'/>
-			<xs:enumeration value='sq'/>
-			<xs:enumeration value='sq'/>
-			<xs:enumeration value='sr'/>
-			<xs:enumeration value='ss'/>
-			<xs:enumeration value='st'/>
-			<xs:enumeration value='su'/>
-			<xs:enumeration value='sv'/>
-			<xs:enumeration value='sw'/>
-			<xs:enumeration value='ta'/>
-			<xs:enumeration value='te'/>
-			<xs:enumeration value='tg'/>
-			<xs:enumeration value='th'/>
-			<xs:enumeration value='ti'/>
-			<xs:enumeration value='tk'/>
-			<xs:enumeration value='tl'/>
-			<xs:enumeration value='tn'/>
-			<xs:enumeration value='to'/>
-			<xs:enumeration value='tr'/>
-			<xs:enumeration value='ts'/>
-			<xs:enumeration value='tt'/>
-			<xs:enumeration value='tw'/>
-			<xs:enumeration value='ty'/>
-			<xs:enumeration value='ug'/>
-			<xs:enumeration value='uk'/>
-			<xs:enumeration value='ur'/>
-			<xs:enumeration value='uz'/>
-			<xs:enumeration value='ve'/>
-			<xs:enumeration value='vi'/>
-			<xs:enumeration value='vo'/>
-			<xs:enumeration value='wa'/>
-			<xs:enumeration value='wo'/>
-			<xs:enumeration value='xh'/>
-			<xs:enumeration value='yi'/>
-			<xs:enumeration value='yo'/>
-			<xs:enumeration value='za'/>
-			<xs:enumeration value='zh'/>
-			<xs:enumeration value='zh'/>
-			<xs:enumeration value='zu'/>
-		</xs:restriction>
-	</xs:simpleType>
-
 	<xs:simpleType name='restrictAttrType'>
 		<xs:restriction base='xs:token'>
 			<!-- simplified package dependency syntax -->

[gentoo-commits] data/xml-schema:master commit in: /

[Ulrich Müller]

commit:     e8495470d00cd9912f3d216eb576b72a0f1fc77f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 21:46:21 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 21 21:46:21 2022 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=e8495470

repositories.xsd: owner elements are ordered

Namely, email before name, for consistency with repositories.dtd.
Current repositories.xml still validates after this change.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 repositories.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repositories.xsd b/repositories.xsd
index 54bf62a..8454c7a 100644
--- a/repositories.xsd
+++ b/repositories.xsd
@@ -61,12 +61,12 @@
 	</xs:complexType>
 
 	<xs:complexType name='ownerType'>
-		<xs:all>
+		<xs:sequence>
 			<xs:element name='email' type='emailType'
 				minOccurs='1' maxOccurs='1'/>
 			<xs:element name='name' type='xs:token'
 				minOccurs='0' maxOccurs='1'/>
-		</xs:all>
+		</xs:sequence>
 		<xs:attribute name='type' type='ownerTypeAttrType'
 			use='required'/>
 	</xs:complexType>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     1f044715a9459c7d0f724d4a7c5e18b274254ae2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 20:11:01 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 20:11:01 2021 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=1f044715

metadata.xsd: Add <maintainer proxied=""/> attribute

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 metadata.xsd | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/metadata.xsd b/metadata.xsd
index db243ab..d2e3d4f 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -127,6 +127,8 @@
 		</xs:choice>
 		<xs:attribute name='type' type='maintainerTypeAttrType'
 			use='required'/>
+		<xs:attribute name='proxied' type='maintainerProxiedAttrType'
+			default='no'/>
 		<xs:attribute name='restrict' type='restrictAttrType'
 			default=''/>
 	</xs:complexType>
@@ -138,6 +140,14 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name='maintainerProxiedAttrType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='yes'/>
+			<xs:enumeration value='no'/>
+			<xs:enumeration value='proxy'/>
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:complexType name='upstreamMaintainerType'>
 		<xs:all>
 			<xs:element name='email' type='emailType'

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     cd3e62ffb7761008bba5eed179805adc10f1e627
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 18:13:56 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 18:13:56 2020 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=cd3e62ff

metadata.xsd: Allow heptapod for remote-id

Submitted-by: Torokhov Sergey <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 metadata.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.xsd b/metadata.xsd
index 8b8ac0b..db243ab 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -272,6 +272,7 @@
 			<xs:enumeration value='gitlab'/>
 			<xs:enumeration value='gitorious'/>
 			<xs:enumeration value='google-code'/>
+			<xs:enumeration value='heptapod'/>
 			<xs:enumeration value='launchpad'/>
 			<xs:enumeration value='pear'/>
 			<xs:enumeration value='pecl'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     f3e602356461a6ecf12543d22ec76d39e2f44769
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 07:53:35 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 08:30:07 2018 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=f3e60235

Add initial schema for GLSAs

 glsa.xsd | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)

diff --git a/glsa.xsd b/glsa.xsd
new file mode 100644
index 0000000..e94f3ca
--- /dev/null
+++ b/glsa.xsd
@@ -0,0 +1,280 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+	<xs:element name='glsa' type='glsaType'/>
+
+	<!-- elements -->
+	<xs:complexType name='glsaType'>
+		<xs:sequence>
+			<xs:element name='title' type='xs:token'/>
+			<xs:element name='synopsis' type='xs:token'/>
+			<xs:element name='product' type='productType'/>
+			<xs:element name='announced' type='xs:date'/>
+			<xs:element name='revised' type='revisedType'/>
+			<xs:element name='bug' type='xs:positiveInteger'
+				minOccurs='0' maxOccurs='unbounded'/>
+			<xs:element name='access' type='xs:token'
+				minOccurs='0' maxOccurs='1'/>
+			<xs:element name='affected' type='affectedType'/>
+			<xs:element name='background' type='partialHTMLType'
+				minOccurs='0' maxOccurs='1'/>
+			<xs:element name='description' type='partialHTMLType'/>
+			<xs:element name='impact' type='impactType'/>
+			<xs:element name='workaround' type='partialHTMLType'/>
+			<xs:element name='resolution' type='partialHTMLType'/>
+			<xs:element name='references' type='referencesType'/>
+			<xs:element name='license' type='licenseType'
+				minOccurs='0' maxOccurs='1'/>
+			<xs:element name='metadata' type='metadataType'
+				minOccurs='0' maxOccurs='unbounded'/>
+		</xs:sequence>
+		<xs:attribute name='id' type='glsaIdType' use='required'/>
+	</xs:complexType>
+
+	<xs:complexType name='productType'>
+		<xs:simpleContent>
+			<xs:extension base="xs:token">
+				<xs:attribute name='type' type='productTypeType' use='required'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name='revisedType'>
+		<xs:simpleContent>
+			<xs:extension base='xs:date'>
+				<xs:attribute name='count' type='xs:positiveInteger'
+					default='1'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name='affectedType'>
+		<xs:sequence>
+			<xs:element name='package' type='affectedPackageType'
+				minOccurs='0' maxOccurs='unbounded'/>
+			<xs:element name='service' type='affectedServiceType'
+				minOccurs='0' maxOccurs='unbounded'/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name='affectedPackageType'>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='vulnerable' type='affectedPackageVulnerableType'/>
+			<xs:element name='unaffected' type='affectedPackageUnaffectedType'/>
+		</xs:choice>
+		<xs:attribute name='name' type='pkgType' use='required'/>
+		<xs:attribute name='auto' type='yesNoType' use='required'/>
+		<xs:attribute name='arch' type='archType' use='required'/>
+	</xs:complexType>
+
+	<xs:complexType name='affectedServiceType'>
+		<xs:simpleContent>
+			<xs:extension base='serviceURLType'>
+				<xs:attribute name='type' type='serviceTypeType'
+					use='required'/>
+				<xs:attribute name='fixed' type='yesNoType'
+					default='no'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name='affectedPackageVulnerableType'>
+		<xs:simpleContent>
+			<xs:extension base='versionType'>
+				<xs:attribute name='range' type='versionRangeType'
+					use='required'/>
+				<xs:attribute name='slot' type='slotType'
+					default='*'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name='affectedPackageUnaffectedType'>
+		<xs:simpleContent>
+			<xs:extension base='versionType'>
+				<xs:attribute name='range' type='versionRangeType'
+					use='required'/>
+				<xs:attribute name='slot' type='slotType'
+					default='*'/>
+				<xs:attribute name='name' type='pkgType'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<!-- value types -->
+	<xs:simpleType name='glsaIdType'>
+		<xs:restriction base='xs:token'>
+			<!-- YYYYMM-NN -->
+			<xs:pattern value="[0-9]{4}(0[1-9]|1[0-2])-[0-9]{2}"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='productTypeType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='ebuild'/>
+			<xs:enumeration value='informational'/>
+			<xs:enumeration value='infrastructure'/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='yesNoType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='yes'/>
+			<xs:enumeration value='no'/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='archType'>
+		<xs:restriction base='xs:token'>
+			<!-- '*' or 1+ arches -->
+			<xs:pattern value="[*]|[a-z0-9-]+(\s+[a-z0-9-]+)*"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='versionRangeType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='le'/>
+			<xs:enumeration value='lt'/>
+			<xs:enumeration value='eq'/>
+			<xs:enumeration value='gt'/>
+			<xs:enumeration value='ge'/>
+			<xs:enumeration value='rle'/>
+			<xs:enumeration value='rlt'/>
+			<xs:enumeration value='rgt'/>
+			<xs:enumeration value='rge'/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='serviceURLType'>
+		<xs:restriction base='xs:token'>
+			<!-- TODO: improve this? -->
+			<xs:pattern value="((https?|ftps?|rsync)://\S+)?"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='serviceTypeType'>
+		<xs:restriction base='xs:token'>
+			<xs:enumeration value='rsync'/>
+			<xs:enumeration value='web'/>
+			<xs:enumeration value='mirror'/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name='impactType'>
+		<xs:complexContent>
+			<xs:extension base="partialHTMLType">
+				<xs:attribute name='type' type='xs:token' use='required'/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name='referencesType'>
+		<xs:sequence>
+			<xs:element name='uri' type='htmlURIType'
+				minOccurs='0' maxOccurs='unbounded'/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name='licenseType'>
+		<!-- empty by design -->
+	</xs:complexType>
+
+	<xs:complexType name='metadataType'>
+		<xs:simpleContent>
+			<xs:extension base='xs:token'>
+				<!-- TODO: enumerate allowed values? -->
+				<xs:attribute name='tag' type='xs:token' use='required'/>
+				<xs:attribute name='revision' type='xs:token'/>
+				<xs:attribute name='author' type='xs:token'/>
+				<xs:attribute name='timestamp' type='xs:dateTime'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<!-- PMS types -->
+	<xs:simpleType name='pkgType'>
+		<xs:restriction base='xs:token'>
+			<!-- PMS 3.1.1 Category Names + 3.1.2 Package Names -->
+			<!-- note: this does not enforce the 'anything matching
+				 the version syntax' requirement -->
+			<xs:pattern
+				value="[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='versionType'>
+		<xs:restriction base='xs:token'>
+			<!-- PMS 3.2 Version Specifications -->
+			<!-- (optionally followed by '*', for 'eq' operator -->
+			<xs:pattern value="[0-9]+(\.[0-9]+)*[a-z]?((_alpha|_beta|_pre|_rc|_p)[0-9]*)*(-r[0-9]+)?[*]?"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='slotType'>
+		<xs:restriction base='xs:token'>
+			<!-- PMS 3.1.3 Slot Names + special value '*' -->
+			<xs:pattern value="[A-Za-z0-9_][A-Za-z0-9+_.-]*|[*]"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Horrible HTML-like mixed-text -->
+	<xs:complexType name='partialHTMLType'>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='p' type='htmlPType'/>
+			<xs:element name='ul' type='htmlListType'/>
+			<xs:element name='ol' type='htmlListType'/>
+			<xs:element name='code' type='xs:string'/>
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name='htmlPType' mixed='true'>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='mail' type='htmlMailType'/>
+			<xs:element name='uri' type='htmlURIType'/>
+			<xs:element name='b' type='xs:token'/>
+			<xs:element name='i' type='xs:token'/>
+			<xs:element name='br' type='htmlBRType'/>
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name='htmlListType'>
+		<xs:sequence>
+			<xs:element name='li' type='xs:token'
+				minOccurs='1' maxOccurs='unbounded'/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name='htmlBRType'>
+		<!-- empty -->
+	</xs:complexType>
+
+	<xs:complexType name='htmlMailType'>
+		<xs:simpleContent>
+			<xs:extension base="xs:token">
+				<xs:attribute name='link' type='mailLinkType' use='required'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:complexType name='htmlURIType'>
+		<xs:simpleContent>
+			<xs:extension base="xs:token">
+				<xs:attribute name='link' type='uriLinkType' use='required'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<xs:simpleType name='mailLinkType'>
+		<xs:restriction base='xs:token'>
+			<!-- TODO: improve? -->
+			<xs:pattern value="[^@]+@[^.\s]+\.\S+"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name='uriLinkType'>
+		<xs:restriction base='xs:token'>
+			<!-- TODO: improve? -->
+			<xs:pattern value="(http|ftp)s?://\S+"/>
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     8536b990542049f4c81e1e616dd8d5c909266a66
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 07:43:40 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 07:44:28 2018 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=8536b990

metadata.xsd: Support <stabilize-allarches/>, GLEP 68 v1.1

 metadata.xsd | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/metadata.xsd b/metadata.xsd
index cad8304..8b8ac0b 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -20,6 +20,10 @@
 			<xs:selector xpath='slots'/>
 			<xs:field xpath='@lang'/>
 		</xs:unique>
+		<xs:unique name='stabilizeAllArchesUniquityConstraint'>
+			<xs:selector xpath='stabilize-all-arches'/>
+			<xs:field xpath='@restrict'/>
+		</xs:unique>
 		<xs:unique name='upstreamSingleConstraint'>
 			<xs:selector xpath='upstream'/>
 			<xs:field xpath='@fake-only-once'/>
@@ -60,6 +64,7 @@
 					<xs:field xpath='@fake-only-once'/>
 				</xs:unique>
 			</xs:element>
+			<xs:element name='stabilize-allarches' type='stabilizeAllArchesType'/>
 			<xs:element name='upstream' type='upstreamType'>
 				<xs:unique name='upstreamMaintainerUniquityConstraint'>
 					<xs:selector xpath='maintainer'/>
@@ -203,6 +208,12 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- stabilize-allarches -->
+	<xs:complexType name='stabilizeAllArchesType'>
+		<xs:attribute name='restrict' type='restrictAttrType'
+			default=''/>
+	</xs:complexType>
+
 	<!-- use flags -->
 	<xs:complexType name='useType'>
 		<xs:choice minOccurs='0' maxOccurs='unbounded'>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     1ccfac1cd1254d1c1922158bdfab6c002f668340
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 15:50:31 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 15:50:31 2017 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=1ccfac1c

repositories: Make owner type required, now that we filled it in

 repositories.xsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/repositories.xsd b/repositories.xsd
index 32a55ac..54bf62a 100644
--- a/repositories.xsd
+++ b/repositories.xsd
@@ -67,7 +67,8 @@
 			<xs:element name='name' type='xs:token'
 				minOccurs='0' maxOccurs='1'/>
 		</xs:all>
-		<xs:attribute name='type' type='ownerTypeAttrType'/>
+		<xs:attribute name='type' type='ownerTypeAttrType'
+			use='required'/>
 	</xs:complexType>
 
 	<xs:complexType name='sourceType'>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     d7e18ac28cde6806f95f62705874f31e010a9e0e
Author:     Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Sat May  7 21:57:00 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May  8 05:21:25 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=d7e18ac2

metadata.xsd: fix upstream maintainer name uniquity constraint

Current constraint doesn't work because the xpath walk starts from
<maintainer> and looks for children <maintainer>. Move the constraint
inside <upstream> to fix it.

Signed-off-by: Göktürk Yüksek <gokturk <AT> binghamton.edu>

 metadata.xsd | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 41a8fca..cad8304 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -61,6 +61,10 @@
 				</xs:unique>
 			</xs:element>
 			<xs:element name='upstream' type='upstreamType'>
+				<xs:unique name='upstreamMaintainerUniquityConstraint'>
+					<xs:selector xpath='maintainer'/>
+					<xs:field xpath='name'/>
+				</xs:unique>
 				<xs:unique name='bugsToSingleConstraint'>
 					<xs:selector xpath='bugs-to'/>
 					<xs:field xpath='@fake-only-once'/>
@@ -99,12 +103,7 @@
 	<!-- the huge <upstream/> structure -->
 	<xs:complexType name='upstreamType'>
 		<xs:choice minOccurs='0' maxOccurs='unbounded'>
-			<xs:element name='maintainer' type='upstreamMaintainerType'>
-				<xs:unique name='upstreamMaintainerUniquityConstraint'>
-					<xs:selector xpath='maintainer'/>
-					<xs:field xpath='name'/>
-				</xs:unique>
-			</xs:element>
+			<xs:element name='maintainer' type='upstreamMaintainerType'/>
 			<xs:element name='changelog' type='urlOnceType'/>
 			<xs:element name='doc' type='upstreamDocType'/>
 			<xs:element name='bugs-to' type='urlOnceType'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     6389c1b2c651d67d3932cfd65fcc080cf2c5c1f3
Author:     Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Sat May  7 21:17:51 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May  8 05:20:58 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=6389c1b2

metadata.xsd: properly check for duplicate <longdescription> elements

The uniqueness constraint for <longdescription> is on (@lang, @restrict).
However, there's no default value for restrict which makes the constraint fail.

Signed-off-by: Göktürk Yüksek <gokturk <AT> binghamton.edu>

 metadata.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.xsd b/metadata.xsd
index 111e1ec..41a8fca 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -168,7 +168,7 @@
 			<xs:element name='cat' type='catType'/>
 		</xs:choice>
 		<xs:attribute name='lang' type='langAttrType' default='en'/>
-		<xs:attribute name='restrict' type='restrictAttrType'/>
+		<xs:attribute name='restrict' type='restrictAttrType' default=''/>
 	</xs:complexType>
 
 	<xs:complexType name='catLongDescType' mixed='true'>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     ea67cd7621339baf5336b57a245a03ea66c3c43c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 16:08:56 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May  7 16:08:56 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=ea67cd76

metadata: Correctly require downstream maintainer <email/>

 metadata.xsd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 27039cd..111e1ec 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -11,11 +11,11 @@
 			<xs:field xpath='@lang'/>
 			<xs:field xpath='@restrict'/>
 		</xs:unique>
-		<xs:unique name='maintainerUniquityConstraint'>
+		<xs:key name='maintainerKeyConstraint'>
 			<xs:selector xpath='maintainer'/>
 			<xs:field xpath='email'/>
 			<xs:field xpath='@restrict'/>
-		</xs:unique>
+		</xs:key>
 		<xs:unique name='slotsUniquityConstraint'>
 			<xs:selector xpath='slots'/>
 			<xs:field xpath='@lang'/>
@@ -123,7 +123,8 @@
 		</xs:choice>
 		<xs:attribute name='type' type='maintainerTypeAttrType'
 			use='required'/>
-		<xs:attribute name='restrict' type='restrictAttrType'/>
+		<xs:attribute name='restrict' type='restrictAttrType'
+			default=''/>
 	</xs:complexType>
 
 	<xs:simpleType name='maintainerTypeAttrType'>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     6070512ca8d633167fdcb976e386df7b834b7f61
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May  6 19:48:22 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May  6 19:48:22 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=6070512c

metadata: Fix allowing multiple <description/>s on maintainers

 metadata.xsd | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index fe2c5d2..27039cd 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -41,6 +41,10 @@
 		<xs:choice minOccurs='0' maxOccurs='unbounded'>
 			<xs:element name='longdescription' type='longDescType'/>
 			<xs:element name='maintainer' type='maintainerType'>
+				<xs:unique name='maintainerNameSingleConstraint'>
+					<xs:selector xpath='name'/>
+					<xs:field xpath='@fake-only-once'/>
+				</xs:unique>
 				<xs:unique name='maintainerDescUniquityConstraint'>
 					<xs:selector xpath='description'/>
 					<xs:field xpath='@lang'/>
@@ -112,14 +116,11 @@
 
 	<!-- maintainer in two variants -->
 	<xs:complexType name='maintainerType'>
-		<xs:all>
-			<xs:element name='email' type='emailType'
-				minOccurs='1'/>
-			<xs:element name='name' type='xs:token'
-				minOccurs='0'/>
-			<xs:element name='description' type='maintainerDescType'
-				minOccurs='0'/>
-		</xs:all>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='email' type='emailType'/>
+			<xs:element name='name' type='tokenOnceType'/>
+			<xs:element name='description' type='maintainerDescType'/>
+		</xs:choice>
 		<xs:attribute name='type' type='maintainerTypeAttrType'
 			use='required'/>
 		<xs:attribute name='restrict' type='restrictAttrType'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     3707b48c28806c68cf1826a7bcf5b982fc9e7d5e
Author:     Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Thu May  5 23:16:56 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May  6 05:16:26 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=3707b48c

metadata.xsd: upstream maintainer must have exactly one <name/> element

Signed-off-by: Göktürk Yüksek <gokturk <AT> binghamton.edu>

 metadata.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.xsd b/metadata.xsd
index 8bc6a4e..fe2c5d2 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -137,7 +137,7 @@
 			<xs:element name='email' type='emailType'
 				minOccurs='0'/>
 			<xs:element name='name' type='xs:token'
-				minOccurs='0'/>
+				minOccurs='1'/>
 		</xs:all>
 		<xs:attribute name='status' type='upstreamMaintainerStatusAttrType'
 			default='unknown'/>

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     181e46892590b84add173078455c4b8a99259e85
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 15:45:01 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 15:45:01 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=181e4689

Disallow whitespace in URLs

 metadata.xsd     | 2 +-
 projects.xsd     | 2 +-
 repositories.xsd | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 0ead09e..8bc6a4e 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -532,7 +532,7 @@
 	<xs:simpleType name='urlType'>
 		<xs:restriction base='xs:token'>
 			<!-- TODO: something better? -->
-			<xs:pattern value="(mailto:[^@]+@[^.]+\..+|https?://.+)"/>
+			<xs:pattern value="(mailto:[^@]+@[^.\s]+\.\S+|https?://\S+)"/>
 		</xs:restriction>
 	</xs:simpleType>
 

diff --git a/projects.xsd b/projects.xsd
index 770bd67..beaaf4e 100644
--- a/projects.xsd
+++ b/projects.xsd
@@ -85,7 +85,7 @@
 	<xs:simpleType name='urlType'>
 		<xs:restriction base='xs:token'>
 			<!-- TODO: something better? -->
-			<xs:pattern value="(mailto:[^@]+@[^.]+\..+|https?://.+)"/>
+			<xs:pattern value="https?://\S+"/>
 		</xs:restriction>
 	</xs:simpleType>
 

diff --git a/repositories.xsd b/repositories.xsd
index ef6792e..32a55ac 100644
--- a/repositories.xsd
+++ b/repositories.xsd
@@ -340,7 +340,7 @@
 	<xs:simpleType name='urlType'>
 		<xs:restriction base='xs:token'>
 			<!-- TODO: something better? -->
-			<xs:pattern value="[^:]+:.+"/>
+			<xs:pattern value="[^:\s]+:\S+"/>
 		</xs:restriction>
 	</xs:simpleType>
 

[gentoo-commits] data/xml-schema:master commit in: /

[Michał Górny]

commit:     9de0e83fb8bc56c8e2db187e6bc66dc85cce9afa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 17:27:08 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:27:08 2016 +0000
URL:        https://gitweb.gentoo.org/data/xml-schema.git/commit/?id=9de0e83f

metadata: Use more portable fake-attr uniquity constraint for subslots

 metadata.xsd | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/metadata.xsd b/metadata.xsd
index 493c930..0ead09e 100644
--- a/metadata.xsd
+++ b/metadata.xsd
@@ -51,6 +51,10 @@
 					<xs:selector xpath='slot'/>
 					<xs:field xpath='@name'/>
 				</xs:unique>
+				<xs:unique name='subslotsSingleConstraint'>
+					<xs:selector xpath='subslots'/>
+					<xs:field xpath='@fake-only-once'/>
+				</xs:unique>
 			</xs:element>
 			<xs:element name='upstream' type='upstreamType'>
 				<xs:unique name='bugsToSingleConstraint'>
@@ -175,25 +179,9 @@
 
 	<!-- slots -->
 	<xs:complexType name='slotsType'>
-		<!-- the crazy magic below is to cover any order possible
-			 in a deterministic way -->
-		<xs:choice>
-			<xs:sequence>
-				<xs:element name='slot' type='slotType'
-					minOccurs='1' maxOccurs='unbounded'/>
-				<xs:sequence minOccurs='0' maxOccurs='1'>
-					<xs:element name='subslots' type='xs:token'
-						minOccurs='1' maxOccurs='1'/>
-					<xs:element name='slot' type='slotType'
-						minOccurs='0' maxOccurs='unbounded'/>
-				</xs:sequence>
-			</xs:sequence>
-			<xs:sequence>
-				<xs:element name='subslots' type='xs:token'
-					minOccurs='1' maxOccurs='1'/>
-				<xs:element name='slot' type='slotType'
-					minOccurs='0' maxOccurs='unbounded'/>
-			</xs:sequence>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='slot' type='slotType'/>
+			<xs:element name='subslots' type='tokenOnceType'/>
 		</xs:choice>
 		<xs:attribute name='lang' type='langAttrType' default='en'/>
 	</xs:complexType>
@@ -532,6 +520,15 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:complexType name='tokenOnceType'>
+		<xs:simpleContent>
+			<xs:extension base="xs:token">
+				<xs:attribute name='fake-only-once'
+					fixed='there can be at most one element of this type'/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
 	<xs:simpleType name='urlType'>
 		<xs:restriction base='xs:token'>
 			<!-- TODO: something better? -->