Index: archive/farstream.xml
===================================================================
--- archive/farstream.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
+++ archive/farstream.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY farstream-download-http
+           "http://freedesktop.org/software/farstream/releases/farstream/farstream-&farstream-version;.tar.gz">
+  <!ENTITY farstream-download-ftp  " ">
+  <!ENTITY farstream-md5sum        "a8971167068b69a6933d3eaaeb9ab448">
+  <!ENTITY farstream-size          "1.2 MB">
+  <!ENTITY farstream-buildsize     "30 MB">
+  <!ENTITY farstream-time          "0.2 SBU">
+]>
+
+<sect1 id="farstream" xreflabel="Farstream-&farstream-version;">
+  <?dbhtml filename="farstream.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Farstream-&farstream-version;</title>
+
+  <indexterm zone="farstream">
+    <primary sortas="a-Farstream">Farstream</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Farstream</title>
+
+    <para>
+      The <application>Farstream</application> package contains libraries
+      and a collection of <application>GStreamer</application> modules
+      used for video conferencing.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&farstream-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&farstream-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &farstream-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &farstream-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &farstream-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &farstream-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Farstream Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/> and
+      <xref linkend="libnice"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gst10-plugins-bad"/> and
+      <xref linkend="gst10-plugins-good"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <ulink url="https://wiki.gnome.org/action/show/Projects/GUPnP">gupnp-igd</ulink> and
+      <xref linkend="valgrind"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/farstream"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Farstream</title>
+
+    <para>
+      Install <application>Farstream</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libfarstream-0.2.so
+        </seg>
+        <seg>
+          /usr/include/farstream-0.2,
+          /usr/lib/farstream-0.2,
+          /usr/share/farstream,
+          /usr/share/gtk-doc/html/farstream-libs-1.0, and
+          /usr/share/gtk-doc/html/farstream-plugins-0.2
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libfarstream">
+        <term><filename class="libraryfile">libfarstream-0.2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Farstream</application> API functions.
+          </para>
+          <indexterm zone="farstream libfarstream">
+            <primary sortas="c-libfarstream">libfarstream-0.2so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ general.ent	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -386,5 +386,5 @@
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.3">
-<!ENTITY llvm-version                 "3.4">
+<!ENTITY llvm-version                 "3.4.1">
 <!ENTITY lua-version                  "5.2.3">
 <!ENTITY mercurial-version            "3.0">
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ general/prog/llvm.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -7,14 +7,15 @@
   <!ENTITY llvm-download-http "http://llvm.org/releases/&llvm-version;/llvm-&llvm-version;.src.tar.gz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "46ed668a1ce38985120dbf6344cf6116">
-  <!ENTITY llvm-size          "16 MB">
-  <!ENTITY llvm-buildsize     "519 MB (1.1 GB with Clang)">
-  <!ENTITY llvm-time          "11.4 SBU and 0.4 for tests (22.7 SBU with Clang)">
-
-  <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/clang-&llvm-version;.src.tar.gz">
-  <!ENTITY clang-md5sum        "b378f1e2c424e03289effc75268d3d2c">
+  <!ENTITY llvm-md5sum        "b90697f4de35563ad6c35924defa8dd1">
+  <!ENTITY llvm-size          "15 MB">
+  <!ENTITY llvm-buildsize     "624 MB (1.2 GB with Clang)">
+  <!ENTITY llvm-time          "17.1 SBU (33 SBU with Clang) and 0.4 for tests">
+
+  <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/cfe-&llvm-version;.src.tar.gz">
+  <!ENTITY clang-md5sum        "c64fdc567383211c9ac212d6f7b69263">
   <!ENTITY clang-size          "11 MB">
 
-  <!ENTITY compiler-rt-download-http "http://llvm.org/releases/&llvm-version;/compiler-rt-&llvm-version;.src.tar.gz">
+  <!ENTITY rt-version                "3.4">
+  <!ENTITY compiler-rt-download-http "http://llvm.org/releases/&rt-version;/compiler-rt-&rt-version;.src.tar.gz">
   <!ENTITY compiler-rt-md5sum        "7938353e3a3bda85733a165e7ac4bb84">
   <!ENTITY compiler-rt-size          "1.8 MB">
@@ -162,9 +163,9 @@
     </para>
 
-<screen><userinput>tar -xf ../clang-&llvm-version;.src.tar.gz -C tools &amp;&amp;
-tar -xf ../compiler-rt-&llvm-version;.src.tar.gz -C projects &amp;&amp;
-
-mv tools/clang-&llvm-version; tools/clang &amp;&amp;
-mv projects/compiler-rt-&llvm-version; projects/compiler-rt</userinput></screen>
+<screen><userinput>tar -xf ../cfe-&llvm-version;.src.tar.gz -C tools &amp;&amp;
+tar -xf ../compiler-rt-&rt-version;.src.tar.gz -C projects &amp;&amp;
+
+mv tools/cfe-&llvm-version;.src tools/clang &amp;&amp;
+mv projects/compiler-rt-&rt-version; projects/compiler-rt</userinput></screen>
 
     <para>
@@ -173,6 +174,7 @@
     </para>
 
-<screen><userinput>sed -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm-&llvm-version;:' \
+<screen><userinput>sed -e 's:/docs/llvm:/share/doc/llvm-&llvm-version;:' \
     -i Makefile.config.in &amp;&amp;
+
 CC=gcc CXX=g++                         \
 ./configure --prefix=/usr              \
@@ -183,9 +185,4 @@
             --disable-assertions       &amp;&amp;
 make</userinput></screen>
-<!--            -disable-expensive-checks &amp;&amp; default -->
-<!--            -disable-debug-runtime    \ default -->
-<!--            -enable-targets=all       \ default -->
-<!--            -enable-experimental-targets=R600 &amp;&amp;
-it is default, now, not anymore experimental-->
 
     <para>
@@ -205,4 +202,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 for file in /usr/lib/lib{clang,LLVM,LTO}*.a
 do
@@ -264,9 +262,4 @@
       single library.
     </para>
-<!--
-    <para>
-      <parameter>-enable-targets=all</parameter>: This switch ensures
-      that all <application>LLVM</application> targets are built.
-    </para>-->
 
     <para>
@@ -274,13 +267,4 @@
       not necessary on a production system.
     </para>
-<!--
-    <para>
-      <parameter>-enable-experimental-targets=R600</parameter>:
-      This switch enables R600 target which is required by
-      <application>Mesa</application> to build the radeonsi
-      3D driver. It can be used for R600
-      <application>LLVM</application> backend and OpenCL
-      state tracker in <application>Mesa</application>.
-    </para>-->
 
   </sect2>
@@ -296,10 +280,12 @@
       <seglistitem>
         <seg>
-          bugpoint, c-index-test, clang, clang++ (symlink), clang-check, clang-format, clang-tblgen,
-          llc, lli, lli-child-target, llvm-ar, llvm-as, llvm-bcanalyzer, llvm-config, llvm-cov, llvm-diff,
-          llvm-dis, llvm-dwarfdump, llvm-extract, llvm-link, llvm-mc, llvm-mcmarkup,
-          llvm-nm, llvm-objdump,<!-- llvm-prof,--> llvm-ranlib (symlink), llvm-readobj, llvm-rtdyld,
-          llvm-size, llvm-stress, llvm-symbolizer, llvm-tblgen, macho-dump, opt, 
-          scan-build (symlink) and scan-view (symlink)
+          bugpoint, c-index-test, clang, clang++ (symlink), clang-check,
+          clang-format, clang-tblgen, llc, lli, lli-child-target, llvm-ar,
+          llvm-as, llvm-bcanalyzer, llvm-config, llvm-cov, llvm-diff, llvm-dis,
+          llvm-dwarfdump, llvm-extract, llvm-link, llvm-mc, llvm-mcmarkup,
+          llvm-nm, llvm-objdump,<!-- llvm-prof,--> llvm-ranlib (symlink),
+          llvm-readobj, llvm-rtdyld, llvm-size, llvm-stress, llvm-symbolizer,
+          llvm-tblgen, macho-dump, opt, scan-build (symlink) and scan-view
+          (symlink)
         </seg>
         <seg>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ introduction/welcome/changelog.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -46,4 +46,22 @@
 
     <listitem>
+      <para>May 20th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to llvm-3.4.1.  Fixes
+          Fixes <ulink url="&blfs-ticket-root;5045">#5045</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archive farstream.  Addresses
+          Fixes <ulink url="&blfs-ticket-root;5028">#5028</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Correct alsa-lib doc directory.  Fixes
+          Fixes <ulink url="&blfs-ticket-root;5075">#5075</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 19th, 2014</para>
       <itemizedlist>
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ multimedia/libdriv/alsa-lib.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -138,6 +138,7 @@
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html &amp;&amp;
-install -v -m644 doc/doxygen/html/* /usr/share/doc/alsa-&alsa-lib-version;/html</userinput></screen>
+<screen role="root"><userinput>
+install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html &amp;&amp;
+install -v -m644 doc/doxygen/html/* /usr/share/doc/alsa-lib-&alsa-lib-version;/html</userinput></screen>
 
   </sect2>
Index: ltimedia/libdriv/farstream.xml
===================================================================
--- multimedia/libdriv/farstream.xml	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY farstream-download-http
-           "http://freedesktop.org/software/farstream/releases/farstream/farstream-&farstream-version;.tar.gz">
-  <!ENTITY farstream-download-ftp  " ">
-  <!ENTITY farstream-md5sum        "a8971167068b69a6933d3eaaeb9ab448">
-  <!ENTITY farstream-size          "1.2 MB">
-  <!ENTITY farstream-buildsize     "30 MB">
-  <!ENTITY farstream-time          "0.2 SBU">
-]>
-
-<sect1 id="farstream" xreflabel="Farstream-&farstream-version;">
-  <?dbhtml filename="farstream.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Farstream-&farstream-version;</title>
-
-  <indexterm zone="farstream">
-    <primary sortas="a-Farstream">Farstream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Farstream</title>
-
-    <para>
-      The <application>Farstream</application> package contains libraries
-      and a collection of <application>GStreamer</application> modules
-      used for video conferencing.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&farstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&farstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &farstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &farstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &farstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &farstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Farstream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/> and
-      <xref linkend="libnice"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-bad"/> and
-      <xref linkend="gst10-plugins-good"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://wiki.gnome.org/action/show/Projects/GUPnP">gupnp-igd</ulink> and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/farstream"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Farstream</title>
-
-    <para>
-      Install <application>Farstream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfarstream-0.2.so
-        </seg>
-        <seg>
-          /usr/include/farstream-0.2,
-          /usr/lib/farstream-0.2,
-          /usr/share/farstream,
-          /usr/share/gtk-doc/html/farstream-libs-1.0, and
-          /usr/share/gtk-doc/html/farstream-plugins-0.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfarstream">
-        <term><filename class="libraryfile">libfarstream-0.2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Farstream</application> API functions.
-          </para>
-          <indexterm zone="farstream libfarstream">
-            <primary sortas="c-libfarstream">libfarstream-0.2so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 02a33ddb1d08606aff9070a599ea62f2e12fb30b)
+++ multimedia/libdriv/libdriv.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -32,5 +32,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faad2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="farstream.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fdk-aac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
