Index: gnome/core/brasero.xml
===================================================================
--- gnome/core/brasero.xml	(revision 0b1bae8e74ad95e4a4be4725bae6732f0d275c6a)
+++ gnome/core/brasero.xml	(revision b936ad2af3931591618570e2d35a149bf1e0c9ec)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY brasero-download-http "&gnome-download-http;/brasero/&gnome-version;/brasero-&brasero-version;.tar.xz">
-  <!ENTITY brasero-download-ftp  "&gnome-download-ftp;/brasero/&gnome-version;/brasero-&brasero-version;.tar.xz">
-  <!ENTITY brasero-md5sum        "b4b13ce81a344b81ddd3a64a3003787b">
-  <!ENTITY brasero-size          "2.8 MB">
+  <!ENTITY brasero-download-http 
+           "&gnome-download-http;/brasero/3.4/brasero-&brasero-version;.tar.xz">
+  <!ENTITY brasero-download-ftp  
+           "&gnome-download-ftp;/brasero/3.4/brasero-&brasero-version;.tar.xz">
+  <!ENTITY brasero-md5sum        "2eed4821826cc5121e430a43a2e78112">
+  <!ENTITY brasero-size          "3.1 MB">
   <!ENTITY brasero-buildsize     "93 MB">
-  <!ENTITY brasero-time          "2.6 SBU">
+  <!ENTITY brasero-time          "1.4 SBU">
 ]>
 
@@ -35,5 +37,5 @@
     easily and quickly.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62,26 +64,35 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gst-plugins-base"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="libunique"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gst-plugins-base"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libnotify"/> and
+      <xref linkend="which"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="nautilus"/>,
+      <xref linkend="rarian"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://libburnia-project.org/">libburn</ulink>,
-    <ulink url="http://libburnia-project.org/">libisofs</ulink>,
-    <xref linkend="nautilus"/>, and
-    <xref linkend="totem-pl-parser"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <ulink url="http://libburnia-project.org/">libburn</ulink>,
+      <ulink url="http://libburnia-project.org/">libisofs</ulink> and
+      <xref linkend="tracker"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
     <para role="recommended">
-    <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
-    <!-- won't it use xorriso? --> or
-    <ulink url="http://www.cdrkit.org/">cdrkit</ulink> (For CD burning), and
-    <xref linkend="dvd-rw-tools"/> (For DVD burning)</para>
+      <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink> or
+      <ulink url="http://www.cdrkit.org/">cdrkit</ulink> (For CD burning),
+      <xref linkend="dvd-rw-tools"/> (For DVD burning) and
+      <xref linkend="gvfs"/> (Built with libcdio support - for gvfsd-burn)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -96,5 +107,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -109,7 +120,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><option>--disable-scrollkeeper</option>: This parameter disables
-    updates to the scrollkeeper database.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -127,19 +135,15 @@
 
       <seglistitem>
-        <seg>brasero</seg>
-        <seg>libbrasero-audio2cue.so, libbrasero-burn-uri.so,
-        libbrasero-cdda2wav.so, libbrasero-cdrdao.so, libbrasero-cdrecord.so,
-        libbrasero-checksum-file.so, libbrasero-checksum.so,
-        libbrasero-dvdauthor.so, libbrasero-dvdcss.so,
-        libbrasero-dvdrwformat.so, libbrasero-genisoimage.so,
-        libbrasero-growisofs.so, libbrasero-local-track.so,
-        libbrasero-mkisofs.so, libbrasero-normalize.so, libbrasero-readcd.so,
-        libbrasero-readom.so, libbrasero-transcode.so, libbrasero-vcdimager.so,
-        libbrasero-vob.so, libbrasero-wodim.so, libbrasero-burn.so,
-        libbrasero-media.so, libbrasero-utils.so, and
-        libnautilus-brasero-extension.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/brasero,lib/brasero/plugins,
-        share/{brasero/icons/hicolor/*},gnome/help/brasero/*,
-        gtk-doc/html/{libbrasero-burn,libbrasero-media},omf/brasero}}</seg>
+        <seg>
+          brasero
+        </seg>
+        <seg>
+          libbrasero-burn3.so, libbrasero-media3.so and libbrasero-utils3.so
+        </seg>
+        <seg>
+          /usr/include/brasero3, /usr/lib/brasero3, /usr/share/brasero,
+          /usr/share/gnome/help/brasero and
+          /usr/share/gtk-doc/html/{libbrasero-burn,libbrasero-media} 
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -161,30 +165,30 @@
       </varlistentry>
 
-      <varlistentry id="libbrasero-burn">
-        <term><filename class='libraryfile'>libbrasero-burn.so</filename></term>
-        <listitem>
-          <para>contains the burning API functions.</para>
-          <indexterm zone="brasero libbrasero-burn">
-            <primary sortas="c-libbrasero-burn">libLIBRARY1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrasero-media">
-        <term><filename class='libraryfile'>libbrasero-media.so</filename></term>
-        <listitem>
-          <para>contains the media API functions.</para>
-          <indexterm zone="brasero libbrasero-media">
-            <primary sortas="c-libbrasero-media">libbrasero-media.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrasero-utils">
-        <term><filename class='libraryfile'>libbrasero-utils.so</filename></term>
-        <listitem>
-          <para>contains the <application>brasero</application> API functions.</para>
-          <indexterm zone="brasero libbrasero-utils">
-            <primary sortas="c-libLIBRARY1">libbrasero-utils.so</primary>
+      <varlistentry id="libbrasero-burn3">
+        <term><filename class='libraryfile'>libbrasero-burn3.so</filename></term>
+        <listitem>
+          <para>contains the Burning API functions.</para>
+          <indexterm zone="brasero libbrasero-burn3">
+            <primary sortas="c-libbrasero-burn3">libbrasero-burn3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libbrasero-media3">
+        <term><filename class='libraryfile'>libbrasero-media3.so</filename></term>
+        <listitem>
+          <para>contains the Media API functions.</para>
+          <indexterm zone="brasero libbrasero-media3">
+            <primary sortas="c-libbrasero-media3">libbrasero-media3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libbrasero-utils3">
+        <term><filename class='libraryfile'>libbrasero-utils3.so</filename></term>
+        <listitem>
+          <para>contains the <application>Brasero</application> API functions.</para>
+          <indexterm zone="brasero libbrasero-utils3">
+            <primary sortas="c-libbrasero-utils3">libbrasero-utils3.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/evince.xml
===================================================================
--- gnome/core/evince.xml	(revision 0b1bae8e74ad95e4a4be4725bae6732f0d275c6a)
+++ gnome/core/evince.xml	(revision b936ad2af3931591618570e2d35a149bf1e0c9ec)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evince-download-http "&gnome-download-http;/evince/&gnome-version;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/&gnome-version;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "8c01b6741709b8e32b800b71820648ac">
-  <!ENTITY evince-size          "3.7 MB">
-  <!ENTITY evince-buildsize     "85 MB">
-  <!ENTITY evince-time          "2.5 SBU">
+  <!ENTITY evince-download-http "&gnome-download-http;/evince/3.4/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/3.4/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "23c8a5eec7686d2bb607f9c8245ad242">
+  <!ENTITY evince-size          "5.9 MB">
+  <!ENTITY evince-buildsize     "90 MB">
+  <!ENTITY evince-time          "3.7 SBU">
 ]>
 
@@ -60,42 +60,41 @@
     </itemizedlist>
 
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/evince-&evince-version;-t1lib-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-    -->
-
     <bridgehead renderas="sect3">Evince Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gtk3"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="which"/>
+    </para>
 
     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required"><xref linkend="shared-mime-info"/></para>
+    <para role="required">
+      <xref linkend="shared-mime-info"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libgxps"/> (required for XPS support),
+      <xref linkend="nautilus"/> (required for the Nautilus plugin) and
+      <xref linkend="poppler"/> (required for PDF support and must be built
+      with <application>GTK+</application> support).
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GConf"/>,
-    <xref linkend="libgnome-keyring"/>,
-    <!-- recommended for gtk3 <xref linkend="gobject-introspection"/>,-->
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="libtiff"/>,
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/> (required to build the DVI viewer),
-    <xref linkend="nautilus"/>
-      (required to build the <application>Nautilus</application> plugin),
-    <xref linkend="poppler"/> (required for PDF support and must be built
-      with <application>GTK+</application> support),
-    <ulink url="http://libspectre.freedesktop.org/wiki/">libspectre</ulink>
-    (required for Postscript ability from <application>Evince</application>),
-    <ulink url="http://djvulibre.djvuzone.org/">DjVuLibre</ulink>
-    (required for DjVu graphics from <application>Evince</application>), and
-    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>
-    (required for Type1 font support in the DVI viewer)</para>
+    <para role="optional">
+      <ulink url="http://djvulibre.djvuzone.org/">DjVuLibre</ulink>
+      (required for DjVu graphics from <application>Evince</application>),
+      <xref linkend="gtk-doc"/>,
+      <ulink url="http://libspectre.freedesktop.org/wiki/">libspectre</ulink>
+      (required for Postscript ability from <application>Evince</application>),
+      <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>
+      (required for Type1 font support in the DVI viewer) and
+      <xref linkend="texlive"/> (required to build the DVI viewer).
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -110,10 +109,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/evince \
-            --without-keyring \
-            --disable-nautilus \
-            --disable-pdf \
-            --enable-introspection &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/evince \
+            --enable-introspection \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -136,44 +133,33 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/evince</parameter>: This
+    <para><parameter>--libexecdir=/usr/lib/evince</parameter>: This
     parameter is used so that the <application>Evince</application> internal
     support programs are installed in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/evince</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--without-keyring</parameter>: This parameter disables the
-    use of <application>gnome-keyring</application>. Remove parameter if
-    <application>gnome-keyring</application> is installed.</para>
-
-    <para><parameter>--disable-nautilus</parameter>: This parameter disables the
-    <application>Nautilus</application> Plugin. Remove parameter if
-    <application>Nautilus</application> is installed.</para>
-
-    <para><parameter>--disable-pdf</parameter>: This parameter disables the PDF
-    Backend. Remove parameter if <application>Poppler</application> is
-    installed.</para>
-
-    <!-- gobject-introspection is recommended for gnome (see e.g. gtk3) -->
-    <para><parameter>--enable-introspection</parameter>: by default, the
+    class='directory'>/usr/lib/evince</filename> instead of <filename
+    class='directory'>/usr/libexec</filename>.</para>
+
+    <para><parameter>--enable-introspection</parameter>: By default, the
     gobject-introspection support is turned off, even though that package
     is an expected component of a <application>GNOME</application> system.
     The introspection support is, however, required if you intend to build
-    <xref linkend="gnome-documents"/>,
-    so it is enabled here. Most BLFS users can probably omit it and find
-    local files using e.g. <command>find -name '*.pdf'</command>.</para>
+    <xref linkend="gnome-documents"/>, so it is enabled here.</para>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
+
+    <para><parameter>--without-keyring</parameter>: This parameter disables the
+    use of <application>gnome-keyring</application>. Use this parameter if
+    <application>libgnome-keyring</application> is not installed.</para>
+
+    <para><parameter>--disable-nautilus</parameter>: This parameter disables the
+    <application>Nautilus</application> Plugin. Add this parameter if
+    <application>Nautilus</application> is not installed.</para>
+
+    <para><parameter>--disable-pdf</parameter>: This parameter disables the PDF
+    Backend. Add this parameter if <application>Poppler</application> is not
+    installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para><option>--enable-dvi</option>: Use this parameter if you have the
-    <application>teTeX</application> or <application>TeX Live</application>
-    package installed and you wish to build support to view DVI files.</para>
-
-    <para><option>--enable-t1lib</option>: Use this parameter if you have the
-    <application>t1lib</application> package installed and you wish to build
-    support for Type1 fonts in the DVI viewer.</para>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
 
   </sect2>
@@ -188,16 +174,15 @@
 
       <seglistitem>
-        <seg>evince, evince-previewer, evince-thumbnailer,
-        evince-convert-metadata, and evinced</seg>
-        <seg>libcomicsdocument.{so,a}, libpdfdocument.{so,a},
-        libpixbufdocument.{so,a}, libtiffdocument.{so,a}, libevdocument.{so,a},
-        libevview.{so,a}, and libevince-properties-page.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/evince/&gnome-version;/{libdocument,
-        libview},lib/evince/2/backends,
-        share/{evince/icons/hicolor/{16x16/{actions,mimetypes},22x22/{actions,
-        mimetypes},24x24/{actions,mimetypes},32x32/{actions,mimetypes},
-        48x48/actions,scalable/{actions,mimetypes}},gnome/help/evince/*,
-        gtk-doc/html/{evince,libevdocument-&gnome-version;,
-        libevview-&gnome-version;},omf/evince}}</seg>
+        <seg>
+          evince, evince-previewer and evince-thumbnailer
+        </seg>
+        <seg>
+          libevdocument3.so and libevview3.so
+        </seg>
+        <seg>
+          /usr/include/evince, /usr/lib/evince, /usr/share/evince,
+          /usr/share/gnome/help/evince and
+          /usr/share/gtk-doc/html/{evince,libevdocument-3.0,libevview-3.0}
+        </seg>
       </seglistitem>
     </segmentedlist>
