From cbd04930b3e9bf1446a93263495c8b5e2a8363f4 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Wed, 13 Mar 2013 16:48:19 +0000
Subject: [PATCH] Merge jhalfs 3667

---
 LFS/lfs.xsl         | 29 ++++++++++++++++++++---------
 optimize/opt_config |  3 ++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 354b25b..3a93918 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -192,8 +192,14 @@ esac
                                      @role != 'nodump']/userinput[
                                                        @remap='install']">
       <xsl:if test="../@id = 'ch-system-man-pages'">
-<!-- those files are provided by the shadow package -->
+<!-- these files are provided by the shadow package -->
   <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
+</xsl:text>
+      </xsl:if>
+<!-- Attr man/man2 pages are already installed by man-pages. As of
+     March 2013, they are the same pages. Check it sometimes... -->
+      <xsl:if test="../@id = 'ch-system-attr'">
+        <xsl:text>rm -fv $PKG_DEST/usr/share/man/man2/*
 </xsl:text>
       </xsl:if>
       <xsl:text>rm -fv $PKG_DEST/{,usr/}lib64
@@ -427,13 +433,11 @@ exit
             <xsl:choose>
               <xsl:when test="./literal">
                 <xsl:call-template name="outputpkgdest">
-                  <xsl:with-param name="outputstring"
-                                select="text()[1]"/>
+                  <xsl:with-param name="outputstring" select="text()[1]"/>
                 </xsl:call-template>
                 <xsl:apply-templates select="literal"/>
                 <xsl:call-template name="outputpkgdest">
-                  <xsl:with-param name="outputstring"
-                                select="text()[2]"/>
+                  <xsl:with-param name="outputstring" select="text()[2]"/>
                 </xsl:call-template>
               </xsl:when>
               <xsl:otherwise>
@@ -527,13 +531,20 @@ exit
                                         'install')"/>
              <xsl:text>install&#xA;</xsl:text>
             </xsl:when>
+            <xsl:when test="ancestor::sect1[@id='ch-system-attr']">
+              <xsl:text>DIST_ROOT=$PKG_DEST make</xsl:text>
+              <xsl:call-template name="outputpkgdest">
+                <xsl:with-param name="outputstring"
+                                select="substring-after($outputstring,'make')"/>
+              </xsl:call-template>
+            </xsl:when>
             <xsl:otherwise>
-             <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
-             <xsl:call-template name="outputpkgdest">
-               <xsl:with-param
+              <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
+              <xsl:call-template name="outputpkgdest">>
+                <xsl:with-param
                     name="outputstring"
                     select="substring-after($outputstring,'make')"/>
-             </xsl:call-template>
+              </xsl:call-template>
             </xsl:otherwise>
            </xsl:choose>
           </xsl:otherwise>
diff --git a/optimize/opt_config b/optimize/opt_config
index 7a0df74..a74bbe4 100644
--- a/optimize/opt_config
+++ b/optimize/opt_config
@@ -16,7 +16,8 @@ MAKEFLAGS="-j3"
 #    This list may be different for you.
 #    If your MAKEFLAGS don't contains a -jX option, you can set
 #    a empty list here.
-BLACK_LIST="autoconf dejagnu gettext groff man-db vim"
+BLACK_LIST="attr autoconf dejagnu gettext groff man-db vim"
+#    Rationale for attr: the tests do not pass with -jX
 
 #--- Default optimization mode
 #    This mode is overridden by definitions in opt_override;