Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision cc2fa2fa6ce6ea0620d1e899820ae21eafd75692)
+++ general/genlib/gwrap.xml	(revision 7aeaa620a84ca79e6418acb1bdecbf8ebe717360)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gwrap-download-http "http://download.savannah.gnu.org/releases/g-wrap/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-download-ftp " ">
-  <!ENTITY gwrap-md5sum "4d83964f51376500eedced538c1620cb">
-  <!ENTITY gwrap-size "826 KB">
-  <!ENTITY gwrap-buildsize "8.6 MB">
-  <!ENTITY gwrap-time "0.2 SBU">
+  <!ENTITY gwrap-download-http "http://www.gnucash.org/pub/g-wrap/source/g-wrap-&gwrap-version;.tar.gz">
+  <!ENTITY gwrap-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/g-wrap-&gwrap-version;.tar.gz">
+  <!ENTITY gwrap-md5sum        "bf29b8b563cc27d9f7fd90a6243653aa">
+  <!ENTITY gwrap-size          "403 KB">
+  <!ENTITY gwrap-buildsize     "6.0 MB">
+  <!ENTITY gwrap-time          "0.2 SBU">
 ]>
 
@@ -36,5 +36,7 @@
     <para>The <application>G-Wrap</application> package contains tools for
     exporting <application>C</application> libraries into
-    <application>Scheme</application> interpreters. The version used here is
+    <application>Scheme</application> interpreters.</para>
+
+    <!-- The version used here is
     considered a development version, however it has been confirmed to be a
     reliable replacement for the 'stable' version. The 'stable' version of
@@ -44,5 +46,5 @@
     in the 'stable' series. For further information, please visit the
     <application>G-Wrap</application> homepage at
-    <ulink url="http://www.nongnu.org/g-wrap/"/>.</para>
+    <ulink url="http://www.nongnu.org/g-wrap/"/>.</para> -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,15 +73,17 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="guile"/>, and
-    <xref linkend="GLib"/> or <xref linkend="glib2"/></para>
+    <para role="required"><xref linkend="slib"/> and
+    <xref linkend="GLib"/></para>
 
-    <para>If you are building <application>G-Wrap</application> as a dependency
+    <!-- <para>If you are building <application>G-Wrap</application> as a dependency
     for <application>GnuCash</application>, ensure you have
     <application>GLib</application>-1 installed and you pass the
     <envar>GLIB_XXX</envar> environment variables to the
-    <command>configure</command> script as shown below.</para>
+    <command>configure</command> script as shown below.</para> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gcc"/> (build Java so that
+    <para role="optional"><ulink
+    url="http://www.gnu.org/software/guile-gtk/">guile-gtk</ulink> and
+    <xref linkend="gcc"/> (build Java so that
     <filename class='libraryfile'>libffi</filename> is built)</para>
 
@@ -95,10 +99,24 @@
     commands:</para>
 
-<screen><userinput>GLIB_CFLAGS=$(glib-config --cflags) \
-GLIB_LIBS=$(glib-config --libs) \
-./configure --prefix=/usr &amp;&amp;
+<!-- <screen><userinput>GLIB_CFLAGS=$(glib-config -\-cflags) \
+GLIB_LIBS=$(glib-config -\-libs) \ -->
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>The test suite for this package is currently broken.</para>
+    <para>If you have <xref linkend="tex"/> installed and wish to create
+    alternate formats of the documentation, issue the following
+    commands:</para>
+
+<screen><userinput>cd doc &amp;&amp;
+texi2pdf g-wrap.texi &amp;&amp;
+texi2html g-wrap.texi &amp;&amp;
+makeinfo --plaintext -o g-wrap.txt g-wrap.texi &amp;&amp;
+mv texinfo.tex texinfo.tex.SAVE &amp;&amp;
+texi2dvi g-wrap.texi &amp;&amp;
+dvips -o g-wrap.ps g-wrap.dvi &amp;&amp;
+cd ..</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -106,6 +124,14 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>If you created the alternate formats of the documentation, install
+    it using the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/g-wrap-&gwrap-version; &amp;&amp;
+install -v -m644 doc/g-wrap.{pdf,html,txt,dvi,ps} \
+                 /usr/share/doc/g-wrap-&gwrap-version;</userinput></screen>
   </sect2>
 
+  <!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -121,4 +147,5 @@
 
   </sect2>
+  -->
 
   <sect2 role="content">
@@ -132,6 +159,8 @@
       <seglistitem>
         <seg>g-wrap-config</seg>
-        <seg>/usr/lib/libffi.{so,a}, /usr/lib/libgw-guile-*.{so,a} and
-        /usr/lib/libgwrap-*.{so,a}</seg>
+        <seg>libgw-glib.{so,a}, libgw-gtk.{so,a}, libgw-standard.{so,a},
+        libgw-wct.{so,a}, libgwrap-glib.{so,a} and libgwrap-wct.{so,a}</seg>
+        <!-- <seg>/usr/lib/libffi.{so,a}, /usr/lib/libgw-guile-*.{so,a} and
+        /usr/lib/libgwrap-*.{so,a}</seg> -->
         <seg>/usr/include/g-wrap, /usr/share/doc/g-wrap-&gwrap-version; and
         /usr/share/guile/site</seg>
