From 7735c7ae5e586ef060745eaf2e6973c136a7f64c Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sat, 28 Dec 2013 20:51:15 +0000
Subject: [PATCH] Suppress dependency on the preceding page in X chapter

---
 BLFS/xsl/dependencies.xsl |  1 +
 BLFS/xsl/gen_pkg_list.xsl | 43 +++++++++------------------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/BLFS/xsl/dependencies.xsl b/BLFS/xsl/dependencies.xsl
index b2542a7..7e2619f 100644
--- a/BLFS/xsl/dependencies.xsl
+++ b/BLFS/xsl/dependencies.xsl
@@ -42,6 +42,7 @@
   <xsl:template match="dependency">
     <xsl:variable name="depname">
       <xsl:choose>
+        <xsl:when test="@name='xorg-env'"/>
         <xsl:when test="@name='x-window-system'">xinit</xsl:when>
         <xsl:when test="@name='xorg7'">xinit</xsl:when>
         <xsl:when test="@name='server-mail'">
diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index 8b529b2..6126db4 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -200,41 +200,18 @@
             </xsl:element>
           </xsl:if>
 <!-- Dependencies -->
-<!-- If in Xorg or KDE chapter, consider that the preceding package is
-     the first dependency (not always noted in the book) -->
-          <xsl:if test="ancestor::chapter[@id='kde4-core'] or
-                       (ancestor::chapter[@id='x-window-system'] and
-                        preceding-sibling::sect1[@id != 'xorg7'])">
+<!-- If in Xorg (not anymore) or KDE chapter, consider that the preceding
+     package is the first dependency (not always noted in the book)-->
+          <xsl:if test="ancestor::chapter[@id='kde4-core']">
             <xsl:text>
             </xsl:text>
-            <xsl:choose>
-              <xsl:when test="contains(preceding-sibling::sect1[1]/@id,
-                                       'xorg7-') and
-                              not(contains(preceding-sibling::sect1[1]/@id,
-                                       'driver'))">
-                <xsl:call-template name="expand-deps">
-                  <xsl:with-param name="section">
-                    <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>
-                  </xsl:with-param>
-                  <xsl:with-param name="status" select="'required'"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:element name="dependency">
-                  <xsl:attribute name="status">required</xsl:attribute>
-                  <xsl:attribute name="name">
-                    <xsl:choose>
-                      <xsl:when test="@id='printproto'">xorg-server</xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of
-                          select="preceding-sibling::sect1[1]/@id"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:attribute>
-                  <xsl:attribute name="type">ref</xsl:attribute>
-                </xsl:element>
-              </xsl:otherwise>
-            </xsl:choose>
+            <xsl:element name="dependency">
+              <xsl:attribute name="status">required</xsl:attribute>
+              <xsl:attribute name="name">
+                <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>
+              </xsl:attribute>
+              <xsl:attribute name="type">ref</xsl:attribute>
+            </xsl:element>
           </xsl:if>
           <xsl:apply-templates select=".//para[@role='required' or
                                                @role='recommended' or