*** empty log message ***

4 files changed, 460 insertions, 20 deletions

diff --git a/app-text/gentoo-guide-xml-dtd/files/catalog b/app-text/gentoo-guide-xml-dtd/files/catalog
index 59a37c8d58b1..a3827684c7d5 100644
--- a/app-text/gentoo-guide-xml-dtd/files/catalog
+++ b/app-text/gentoo-guide-xml-dtd/files/catalog
@@ -1,30 +1,15 @@
-  -- ...................................................................... --
-  -- Catalog data for Gentoo Guide XML V1.0 .................................... --
-  -- File catalog ..................................................... --
 
+  -- Catalog data for Gentoo Guide XML V1.0 --
+  -- File catalog  --
 
-  --
+  -- Gentoo Guide driver file .................................................. --
 
-  -- ...................................................................... --
-  -- Simplified DocBook driver file .................................................. --
+PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN" "xml-dtd-1.0/guide.dtd"
+PUBLIC "-//Gentoo//DTD Guide XML V2.0//EN" "xml-dtd-2.0/guide.dtd"
 
-PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN" "guide/guide.dtd"
-
-  -- ...................................................................... --
-  -- Simplified DocBook modules ...................................................... --
-
--- PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML RefEntry V4.1.2.4//EN" "sdocbookref.dtd"
--- PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Document Hierarchy V4.1.2.4//EN" "sdbhier.mod"
--- PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Information Pool V4.1.2.4//EN" "sdbpool.mod"
--- PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Inclusions V4.1.2.4//EN" "sinclist.mod"
--- PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Character Entity Sets V4.1.2.4//EN" "sdbcent.mod"
-
-  -- ...................................................................... --
   -- ISO entity sets ...................................................... --
 
 PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
 PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
 
-  -- End of catalog data for Simplified DocBook XML V4.1.2.4 ............................. --
-  -- ...................................................................... --
diff --git a/app-text/gentoo-guide-xml-dtd/files/guide/guide-1.0.dtd b/app-text/gentoo-guide-xml-dtd/files/guide/guide-1.0.dtd
new file mode 100644
index 000000000000..ee269cdc4ae0
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide-1.0.dtd
@@ -0,0 +1,269 @@
+<!-- *********************************************************************
+     *** THIS IS THE FLATTENED DTD. DO NOT EDIT THIS DTD BY HAND, EDIT ***
+     *** THE CUSTOMIZATION LAYER AND REGNERATE THE FLATTENED DTD! ********
+     ********************************************************************* -->
+
+<!-- ====================================================================== -->
+
+<!-- Gentoo Guide XML V1.0 DTD
+     Copyright (C) 2001 Gentoo Technologies Inc.
+     http://www.gentoo.org/gentoo/guide
+
+     See COPYRIGHT for more information
+
+     Please direct all questions and comments about this DTD to
+     Achim Gottinger <achim@gentoo.org>.
+
+     Common declaration:
+
+     <?xml version="1.0"?>
+     <!DOCTYPE guide
+       PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN"
+       "http://www.gentoo.org/gentoo/guide/guide.dtd">
+                                                                            -->
+<!-- ====================================================================== -->
+<!ENTITY lt	"&#60;">
+<!ENTITY gt	 "&#62;">
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % URI "CDATA">
+<!ENTITY % Character "CDATA">
+<!ENTITY % Text "CDATA">
+
+<!--================== Imported Names ====================================-->
+
+<!-- Parameter Entities -->
+
+<!ENTITY % list "UL | OL">
+
+<!ENTITY % preformatted "PRE">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+    Black  = #000000    Green  = #008000
+    Silver = #C0C0C0    Lime   = #00FF00
+    Gray   = #808080    Olive  = #808000
+    White  = #FFFFFF    Yellow = #FFFF00
+    Maroon = #800000    Navy   = #000080
+    Red    = #FF0000    Blue   = #0000FF
+    Purple = #800080    Teal   = #008080
+    Fuchsia= #FF00FF    Aqua   = #00FFFF
+ -->
+
+ <!--=================== Generic Attributes ===============================-->
+
+ <!ENTITY % coreattrs "id ID #IMPLIED">
+ <!ENTITY % attrs "%coreattrs;">
+
+ <!ENTITY % align "align (left|center|right|justify)  #IMPLIED">
+
+ <!--=================== Text Markup ======================================-->
+
+ <!ENTITY % fontstyle "E">
+ <!ENTITY % phrase "CODE | PATH ">
+ <!ENTITY % special "A | IMG | BR | FONT ">
+ <!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special;">
+<!ELEMENT E  (%inline;)*>
+<!ATTLIST E %attrs;>
+<!ELEMENT CODE  (#PCDATA)*>
+<!ATTLIST CODE %attrs;>
+<!ELEMENT PATH  (#PCDATA)*>
+<!ATTLIST PATH %attrs;>
+
+<!--================== HTML content models ===============================-->
+<!ENTITY % gentoo-block "NOTE | IMPORTANT | WARNING">
+<!ENTITY % block "P | %preformatted; | %list; | TABLE | %gentoo-block;">
+<!ENTITY % flow "%inline; | %block;">
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT BODY (%flow;)* >
+<!ATTLIST BODY
+  %attrs;
+>
+
+<!--================== The Anchor Element ================================-->
+
+<!ELEMENT A (%inline;)*>
+<!ATTLIST A
+    %attrs;
+    name  CDATA  #IMPLIED
+    href  %URI;  #IMPLIED
+  >
+
+<!--=================== Images ===========================================-->
+
+<!ENTITY % Length "CDATA">
+
+<!ENTITY % Pixels "CDATA">
+
+<!ENTITY % IAlign "(top|middle|bottom|left|right)">
+
+<!ELEMENT IMG EMPTY>
+<!ATTLIST IMG
+  %attrs;
+  src         %URI;          #REQUIRED
+  alt         %Text;         #IMPLIED
+  name    CDATA          #IMPLIED
+  height   %Length;       #IMPLIED
+  width     %Length;       #IMPLIED
+  align      %IAlign;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT P (%inline;)*>
+<!ATTLIST P
+  %attrs;
+  %align;
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- excludes markup for images and changes in font size -->
+<!ENTITY % pre.exclusion "IMG">
+
+<!ELEMENT PRE (#PCDATA | A | BR | FONT | %fontstyle; | %phrase;)*>
+<!ATTLIST PRE
+  %attrs;
+  >
+
+<!--=================== Lists ============================================-->
+
+<!-- definition lists - DT for term, DD for its definition -->
+
+<!ELEMENT DL  (DT|DD)+>
+<!ATTLIST DL
+  %attrs;
+  compact     (compact)      #IMPLIED
+  >
+
+<!ELEMENT DT (%inline;)*>
+<!ATTLIST DT
+  %attrs;
+  >
+
+<!ELEMENT DD (%flow;)*>
+<!ATTLIST DD
+  %attrs;
+  >
+
+<!-- Ordered lists (OL) Numbering style
+
+    1   arablic numbers     1, 2, 3, ...
+    a   lower alpha         a, b, c, ...
+    A   upper alpha         A, B, C, ...
+    i   lower roman         i, ii, iii, ...
+    I   upper roman         I, II, III, ...
+
+    The style is applied to the sequence number which by default
+    is reset to 1 for the first list item in an ordered list.
+
+    This can't be expressed directly in SGML due to case folding.
+-->
+
+<!ENTITY % OLStyle "CDATA">
+
+<!ELEMENT OL  (LI)+>
+<!ATTLIST OL
+  %attrs;
+  type        %OLStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  start       NMTOKEN         #IMPLIED
+  >
+
+<!-- Unordered Lists (UL) bullet styles -->
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!ELEMENT UL (LI)+>
+<!ATTLIST UL
+  %attrs;
+  type        %ULStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  >
+
+<!ENTITY % LIStyle "CDATA">
+
+<!ELEMENT LI  (%flow;)*>
+<!ATTLIST LI
+  %attrs;
+  type        %LIStyle;      #IMPLIED
+  value       NMTOKEN     #IMPLIED
+  >
+
+<!--======================= Tables =======================================-->
+
+ <!-- horizontal alignment attributes for cell contents -->
+<!ENTITY % cellhalign  "align      (left|center|right|justify|char) #IMPLIED">
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign "valign (top|middle|bottom|baseline) #IMPLIED">
+
+<!ELEMENT TABLE (TR+)>
+<!ATTLIST TABLE
+  %attrs;
+  width       %Length;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ELEMENT TR (TH|TD)+>
+<!ATTLIST TR
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
+
+<!ELEMENT TH  (%flow;)*>
+<!ATTLIST TH
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+
+<!ELEMENT TD  (%flow;)*>
+<!ATTLIST TD
+  %attrs;
+  rowspan    NMTOKEN #IMPLIED
+  colspan    NMTOKEN  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+
+<!--===================== Gentoo Specific =================================-->
+
+<!ELEMENT TITLE (#PCDATA)>
+<!ELEMENT AUTHOR (#PCDATA)>
+<!ATTLIST AUTHOR
+    title %Text; #IMPLIED
+    email %Text; #IMPLIED
+>
+<!ELEMENT DATE (#PCDATA)>
+<!ELEMENT VERSION (#PCDATA)>
+<!ELEMENT ABSTRACT (#PCDATA)>
+<!ELEMENT CHAPTER (TITLE,SECTION+)>
+<!ATTLIST CHAPTER
+    link %Text; #IMPLIED
+    >
+
+
+<!ELEMENT NOTE (TITLE, BODY)>
+<!ELEMENT WARNING (TITLE, BODY)>
+<!ELEMENT IMPORTANT (TITLE, BODY)>
+
+<!ELEMENT SECTION (TITLE, (BODY|NOTE|WARNING|IMPORTANT)+)>
+<!ELEMENT GUIDE (TITLE, AUTHOR+, VERSION , DATE, ABSTRACT?, CHAPTER+)>
diff --git a/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.0.dtd b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.0.dtd
new file mode 100644
index 000000000000..ed38ff39dd6a
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.0.dtd
@@ -0,0 +1,154 @@
+<!-- This is a DTD, but will be read as -*- sgml -*-   -->
+<!-- ================================================= -->
+
+<!-- ==== Title Elements ====-->
+    <!ENTITY % formalobject.title.content "title">
+    <!ENTITY % div.title.content "title"> <!-- "title, subtitle?" //-->
+    <!ENTITY % sect.title.content "title">
+
+<!-- ==== List Elements ==== -->
+
+    <!ENTITY % list.class "ut|ol">
+
+<!-- ==== Elements which are admonitions. ==== -->
+
+    <!ENTITY % admon.class "note|warning|information">
+
+<!-- ==== Elements which are "line specific". Spaces and line breaks are significant in line specific elements. ==== -->
+
+    <!ENTITY % linespecific.class "pre">
+
+<!-- ==== Paragraph Elements ==== -->
+
+    <!ENTITY % para.class "p">
+
+<!-- ==== Elements which are informal objects. ==== -->
+
+    <!ENTITY % informal.class "img">
+
+<!-- ==== Formal objects (objects with titles). ==== -->
+
+    <!ENTITY % formal.class "example|figure|table">
+
+<!-- ==== Elements which are descriptive in nature. ==== -->
+
+    <!ENTITY % descobj.class "abstract">
+
+<!-- ==== The class of general inline elements. ==== -->
+
+    <!ENTITY % gen.char.class "em|quote">
+
+    <!ENTITY % link.char.class "xref|link">
+
+    <!ENTITY % tech.char.class "code|email|path">
+
+    <!ENTITY % docinfo.char.class "author|version|date">
+
+
+<!-- ==== Mix Objects ==== -->
+
+    <!ENTITY % admon.mix
+            "%list.class;
+            |%linespecific.class;
+            |%para.class;
+            |%informal.class;
+            |%formal.class;">
+
+    <!ENTITY % example.mix
+            "%list.class;
+            |%linespecific.class;
+            |%para.class;
+            |%informal.class;
+            |%formal.class;">
+
+    <!ENTITY % figure.mix
+            "%linespecific.class;|%informal.class;">
+
+
+    <!ENTITY % para.char.mix
+            "#PCDATA
+            |%gen.char.class;
+            |%link.char.class;	|%tech.char.class;">
+
+    <!ENTITY % title.char.mix
+            "#PCDATA
+            |%gen.char.class;
+            |%link.char.class;	|%tech.char.class;
+            |%docinfo.char.class;">
+
+    <!ENTITY % tabentry.mix
+            "%list.class;   |%admon.class;
+            |%linespecific.class;
+            |%para.class;">
+
+    <!ENTITY % cptr.char.mix
+            "#PCDATA
+            |%link.char.class;	|%tech.char.class;">
+
+    <!ENTITY % smallcptr.char.mix "#PCDATA">
+
+    <!ENTITY % docinfo.char.mix
+            "#PCDATA
+            |%link.char.class;
+            |em">
+
+    <!ENTITY % divcomponent.mix
+            "%list.class;|%admon.class;
+            |%linespecific.class;
+            |%para.class;|%informal.class;
+            |%formal.class;
+            |%descobj.class;">
+
+    <!ENTITY % bookcomponent.content "((%divcomponent.mix;)+, section*) | section+">
+
+<!-- ==== Objects ==== -->
+
+    <!ELEMENT title (%title.char.mix;)*>
+
+    <!ELEMENT ul (#PCDATA)>
+    <!ELEMENT ol (#PCDATA)>
+
+    <!ELEMENT note (title?,(%admon.mix))>
+    <!ELEMENT warning (title?,(%admon.mix))>
+    <!ELEMENT information (title?,(%admon.mix))>
+
+    <!ELEMENT pre (%para.char.mix)>
+
+    <!ELEMENT p (%para.char.mix)>
+
+    <!ELEMENT img EMPTY>
+
+    <!ELEMENT example ((%formalobject.title.content;), (%example.mix; | %link.char.class;)+)>
+    <!ELEMENT figure ((%formalobject.title.content;), (%figure.mix; | %link.char.class;)+)>
+
+    <!ELEMENT table (tr+)>
+    <!ELEMENT tr (td+)>
+    <!ELEMENT td (%para.char.mix; | %tabentry.mix;)>
+
+    <!ELEMENT abstract (#PCDATA)>
+
+    <!ELEMENT em (%para.char.mix)>
+    <!ELEMENT quote (%para.char.mix)>
+
+    <!ELEMENT xref EMPTY>
+    <!ELEMENT link (#PCDATA)>
+
+    <!ELEMENT code (%cptr.char.mix;)>
+    <!ELEMENT email (%docinfo.char.mix)>
+    <!ELEMENT path (%smallcptr.char.mix;)>
+
+    <!ELEMENT author (%smallcptr.char.mix;)>
+    <!ELEMENT version (%smallcptr.char.mix;)>
+    <!ELEMENT date (%smallcptr.char.mix;)>
+
+    <!ELEMENT guideinfo (%docinfo.char.class)>
+
+    <!ELEMENT section ((%sect.title.content;),
+            (((%divcomponent.mix;)+, section*)
+            | section+))>
+
+<!-- ==== The ARTICLE element ==== -->
+
+    <!ELEMENT guide ((%div.title.content;), guideinfo?, (%bookcomponent.content;))>
+
+
diff --git a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-1.0-r1.ebuild b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-1.0-r1.ebuild
new file mode 100644
index 000000000000..6ba43e42a110
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Your Name <your email>
+# $Header: /var/cvsroot/gentoo-x86/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-1.0-r1.ebuild,v 1.1 2001/03/26 17:03:19 achim Exp $
+
+S=${WORKDIR}
+DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
+
+DEPEND=">=app-text/sgml-common-0.6.1"
+
+src_install () {
+
+    cd ${FILESDIR}
+
+    insinto /usr/share/sgml/gentoo
+    doins catalog
+    insinto /usr/share/sgml/gentoo/ent
+    doins ent/*.ent
+    insinto /usr/share/sgml/gentoo/xml-dtd-1.0
+    newins guide/guide-1.0.dtd guide.dtd
+    insinto /usr/share/sgml/gentoo/xml-dtd-2.0
+    newins guide/guide-2.0.dtd guide.dtd
+
+}
+
+pkg_postinst() {
+    install-catalog --add /etc/sgml/gentoo-guide.cat /usr/share/sgml/gentoo//catalog
+}
+
+pkg_prerm() {
+    install-catalog --remove /etc/sgml/gentoo-guide.cat /usr/share/sgml/gentoo//catalog
+}