gentoo resync : 15.12.2019

7 files changed, 2 insertions, 132 deletions

diff --git a/metadata/dtd/Manifest.gz b/metadata/dtd/Manifest.gz
index b341b855266e..a95258617a9f 100644
--- a/metadata/dtd/Manifest.gz
+++ b/metadata/dtd/Manifest.gz
diff --git a/metadata/dtd/gleps.dtd b/metadata/dtd/gleps.dtd
deleted file mode 100644
index 524f58a0b696..000000000000
--- a/metadata/dtd/gleps.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ELEMENT gleps (glep+)>
-<!ELEMENT glep  (#PCDATA|uri)*>
-<!ATTLIST glep  id      CDATA #REQUIRED
-                file    CDATA #REQUIRED
-                type    (S|I) "S"
-                status (D|d|A|F|R|W|M) "D">
-<!ELEMENT uri   (#PCDATA)>
-<!ATTLIST uri   link  CDATA #REQUIRED>
diff --git a/metadata/dtd/metadoc.dtd b/metadata/dtd/metadoc.dtd
deleted file mode 100644
index 20e73b2677b4..000000000000
--- a/metadata/dtd/metadoc.dtd
+++ /dev/null
@@ -1,43 +0,0 @@
-<!ENTITY % common SYSTEM "common.dtd">
-
-%common;
-
-<!ELEMENT metadoc (version,members,categories,files,docs)>
-<!ATTLIST metadoc lang     CDATA  #REQUIRED
-                  parent   CDATA  #IMPLIED>
-<!ELEMENT members (lead*,member*)>
-<!ELEMENT lead    (#PCDATA)*>     <!-- <lead>nickname</lead> -->
-<!ELEMENT member  (#PCDATA)*>
-<!ATTLIST member  mail     CDATA  #IMPLIED
-                  fullname CDATA  #IMPLIED>
-<!ELEMENT categories       (cat)*>
-<!ELEMENT cat     (#PCDATA)*>
-<!ATTLIST cat     id       CDATA  #REQUIRED
-                  parent   CDATA  #IMPLIED>
-<!ELEMENT files   (file)*>
-<!ELEMENT file    (#PCDATA)*>
-<!ATTLIST file    id       ID #REQUIRED>
-<!ELEMENT docs    (doc)*>
-<!ELEMENT doc     (memberof*,bookref?,bugs?)>
-<!ATTLIST doc     fileid   CDATA  #REQUIRED>
-<!ELEMENT memberof         (#PCDATA)*>
-<!ELEMENT bookref  EMPTY>
-<!ATTLIST bookref vpart    CDATA  #IMPLIED
-                  vchap    CDATA  #IMPLIED>
-<!ELEMENT bugs    (bug*)>
-<!ELEMENT bug     (#PCDATA)*>
-<!ATTLIST bug     stopper  (yes|no) #IMPLIED
-                  arch     CDATA    #IMPLIED>
-
-<!ELEMENT dynamic (version?, title, intro?, (listing|catid*|overview))>
-<!ATTLIST dynamic metadoc  CDATA  #REQUIRED>
-<!ELEMENT intro   (section)*>       <!-- Section stuff copy/pasted from guide.dtd -->
-<!ELEMENT listing (list)*>
-<!ELEMENT list    (#PCDATA)*>
-<!ELEMENT catid   (#PCDATA)*>
-<!ELEMENT overview         EMPTY>
-
-
-<!ELEMENT section   (include | (title?, body+))>
-
-<!ELEMENT body      (include | (%block.class;)+)>
diff --git a/metadata/dtd/project.dtd b/metadata/dtd/project.dtd
deleted file mode 100644
index adb0a9ba378c..000000000000
--- a/metadata/dtd/project.dtd
+++ /dev/null
@@ -1,56 +0,0 @@
-<!ENTITY % common SYSTEM "common.dtd">
-
-%common;
-
-<!ENTITY  % body.class "%block.class;|glepindex">
-<!ELEMENT body      (%body.class;)*>
-
-<!ELEMENT project (name, longname?, date?, author*, description, longdescription, goals?, recruitment?, (dev | resource | subproject | plannedproject |extraproject | extrachapter |  herd | task | author)* )>
-<!ATTLIST project	disclaimer (draft|obsolete) #IMPLIED
-			redirect CDATA #IMPLIED>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT longname (#PCDATA)>
-<!ELEMENT description (#PCDATA)>
-<!ELEMENT longdescription (%body.class;)* >
-<!ELEMENT goals (%body.class;)* >
-<!ELEMENT recruitment (job+) >
-<!ELEMENT job (summary, details, requirements, contact+) >
-<!ELEMENT details (#PCDATA|%inline.class;)*>
-<!ELEMENT requirements (#PCDATA|%inline.class;)*>
-<!ELEMENT contact (#PCDATA)>
-<!ELEMENT dev (#PCDATA)>
-<!ATTLIST dev role CDATA "member"
-	      description CDATA #IMPLIED>
-<!ELEMENT resource (#PCDATA)>
-<!ATTLIST resource link CDATA #IMPLIED>
-<!ELEMENT subproject EMPTY>
-<!ATTLIST subproject ref CDATA #REQUIRED
-	             inheritmembers ( yes | no ) "no"
-	             inheritresources ( yes | no ) "no" >
-<!ELEMENT extraproject (#PCDATA|%inline.class;)*>
-<!ATTLIST extraproject name CDATA #REQUIRED
-		       lead CDATA #IMPLIED 
-           link CDATA #IMPLIED >
-<!ELEMENT plannedproject (#PCDATA|%inline.class;)*>
-<!ATTLIST plannedproject name CDATA #REQUIRED >
-<!ELEMENT extrachapter               (title, section+)>
-<!ELEMENT section   (title?, body+)>
-
-<!ATTLIST extrachapter position ( top|bottom|subproject|goals|resources|devs|recruitment|tasks ) "bottom">
-<!ELEMENT herd EMPTY>
-<!ATTLIST herd name CDATA #REQUIRED>
-
-<!-- TASK tags declaration -->
-<!ELEMENT task ( name, description, longdescription?, startdate, enddate?, (reference | milestone | dev |depends )* )>
-<!ATTLIST task id ID #IMPLIED
-               lead CDATA #REQUIRED
-               finished (yes | no) "no">
-<!ELEMENT startdate (#PCDATA)>
-<!ELEMENT enddate (#PCDATA)>
-<!ELEMENT reference (#PCDATA | bug | mail | uri)* >
-<!ELEMENT bug (#PCDATA)>
-<!ATTLIST bug no CDATA #REQUIRED>
-<!ELEMENT milestone (enddate, description)>
-<!ATTLIST milestone finished (yes| no) "no">
-<!ELEMENT depends (#PCDATA)>
-<!ATTLIST depends ref IDREF #REQUIRED>
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4dbac8d5490d..ecbf6fa4ff7a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 18 Nov 2019 09:08:51 +0000
+Sun, 15 Dec 2019 17:09:21 +0000
diff --git a/metadata/dtd/timestamp.commit b/metadata/dtd/timestamp.commit
index 10a1acd1d17e..afbda4f0291e 100644
--- a/metadata/dtd/timestamp.commit
+++ b/metadata/dtd/timestamp.commit
@@ -1 +1 @@
-3e5b29b4a7d35ae0a14e3628ef705868688f2c1d 1520927574 2018-03-13T07:52:54+00:00
+3f1a1aa42d0f369a9ae122ad9fe6c8c58468da40 1575918852 2019-12-09T19:14:12+00:00
diff --git a/metadata/dtd/userinfo.dtd b/metadata/dtd/userinfo.dtd
deleted file mode 100644
index 8058c7d79295..000000000000
--- a/metadata/dtd/userinfo.dtd
+++ /dev/null
@@ -1,23 +0,0 @@
-<!ELEMENT userlist (user+)>
-<!ELEMENT user (realname, pgpkey+, alias*, email+, joined*, retired*, status?, roles?, location?) >
-  <!ATTLIST user username ID #REQUIRED>
-  <!ELEMENT realname (firstname,familyname)>
-    <!ATTLIST realname fullname CDATA #IMPLIED>
-    <!ELEMENT firstname (#PCDATA) >
-    <!ELEMENT familyname (#PCDATA) >
-      <!ATTLIST familyname sort CDATA #IMPLIED>
-  <!ELEMENT pgpkey (#PCDATA)>
-  <!ELEMENT alias (#PCDATA)>
-  <!ELEMENT email (#PCDATA)>
-
-  <!-- all dates should be YYYY-MM-DD - eg '2006-11-22' -->
-  <!ELEMENT joined (#PCDATA)>
-  <!ELEMENT retired (#PCDATA)>
-
-  <!ELEMENT status (#PCDATA)>
-  <!ELEMENT roles (#PCDATA)>
-  <!-- Location is the string displayed on the webpage -->
-  <!ELEMENT location (#PCDATA)>
-      <!-- signed decimal numbers. degrees north/east. -->
-      <!ATTLIST location latitude  CDATA #IMPLIED
-                         longitude CDATA #IMPLIED>