Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/genlib/libgcrypt.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -7,9 +7,8 @@
   <!ENTITY libgcrypt-download-http " ">
   <!ENTITY libgcrypt-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-md5sum        "4c13c5fa43147866f993d73ee62af176">
-  <!ENTITY libgcrypt-size          "2.4 MB">
-  <!ENTITY libgcrypt-buildsize     "38 MB (additional 8 MB for docs)">
-  <!ENTITY libgcrypt-time          "0.3 SBU (additional 0.1 SBU for docs and
-                                    0.3 SBU for tests)">
+  <!ENTITY libgcrypt-md5sum        "3babc8af8978eeafa1bdbfef066ea943">
+  <!ENTITY libgcrypt-size          "2.5 MB">
+  <!ENTITY libgcrypt-buildsize     "46 MB (with tests and building docs)">
+  <!ENTITY libgcrypt-time          "0.6 SBU (with tests and building docs)">
 ]>
 
@@ -112,5 +111,5 @@
     </para>
 
-<screen><userinput>make -j1 -C doc pdf ps html &amp;&amp;
+<screen><userinput>make -C doc pdf ps html &amp;&amp;
 makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
 makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</userinput></screen>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/genlib/libgsf.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -7,7 +7,7 @@
   <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
   <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-md5sum        "146c9063296b92803c1721b7bdc23488">
+  <!ENTITY libgsf-md5sum        "a3e9622b31ab88422d519da72e6f0fa4">
   <!ENTITY libgsf-size          "596 KB">
-  <!ENTITY libgsf-buildsize     "16 MB (with tests)">
+  <!ENTITY libgsf-buildsize     "18 MB (with tests)">
   <!ENTITY libgsf-time          "0.3 SBU (with tests)">
 ]>
@@ -109,6 +109,5 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. Some tests
-      may fail for unknown reasons.
+      To test the results, issue: <command>make check</command>.
     </para>
 
Index: general/genlib/libinput.xml
===================================================================
--- general/genlib/libinput.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/genlib/libinput.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -5,9 +5,11 @@
   %general-entities;
 
+  <!ENTITY libinput-version "1.1.7">
+
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "f390e592aa09f77dabceabeb2ddd4419">
-  <!ENTITY libinput-size          "784 KB">
-  <!ENTITY libinput-buildsize     "25 MB">
+  <!ENTITY libinput-md5sum        "a501715a6135ac1f772bb5f3e3183481">
+  <!ENTITY libinput-size          "808 KB">
+  <!ENTITY libinput-buildsize     "32 MB">
   <!ENTITY libinput-time          "0.2 SBU">
 ]>
Index: general/genutils/hicolor-icon-theme.xml
===================================================================
--- general/genutils/hicolor-icon-theme.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/genutils/hicolor-icon-theme.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -5,5 +5,6 @@
   %general-entities;
 
-  <!ENTITY hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
+<!--  <!ENTITY hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">-->
+  <!ENTITY hicolor-icon-theme-download-http "http://pkgs.fedoraproject.org/repo/pkgs/hicolor-icon-theme/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz/md5/&hicolor-icon-theme-md5sum;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
   <!ENTITY hicolor-icon-theme-download-ftp  " ">
   <!--<!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">-->
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/graphlib/freetype2.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -7,14 +7,14 @@
   <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-md5sum        "86109d0c998787d81ac582bad9adf82e">
+  <!ENTITY freetype2-md5sum        "0037b25a8c090bc8a1218e867b32beb1">
   <!ENTITY freetype2-size          "1.7 MB">
-  <!ENTITY freetype2-buildsize     "34 MB (includes installing additional documentation)">
-  <!ENTITY freetype2-time          "0.2 SBU (includes installing additional documentation)">
-
-  <!ENTITY freetype2-doc-version   "2.6.2">
+  <!ENTITY freetype2-buildsize     "43 MB (with additional documentation)">
+  <!ENTITY freetype2-time          "0.2 SBU (with additional documentation)">
+
+  <!ENTITY freetype2-doc-version   "&freetype2-version;">
   <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-doc-version;.tar.bz2">
   <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.bz2">
-  <!ENTITY freetype2-doc-md5sum        "22bd94ab15fc4b434e20161b866d7c3e">
-  <!ENTITY freetype2-doc-size          "468 KB">
+  <!ENTITY freetype2-doc-md5sum        "ec2629b81f80decdae04a4b528097b81">
+  <!ENTITY freetype2-doc-size          "5.2 KB">
 ]>
 
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/prog/perl-modules.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -134,5 +134,11 @@
  sometimes a good place to start, then for scripts look at any comments in the
  script, and if you get a package like Text::BibTeX with compiled progs and
- library, look at the comments in the code -->
+ library, look at the comments in the code
+
+ Also, for external modules where we link to CPAN without a current version,
+ prefer to use http://search.cpan.org/dist/Module-Name if that works, rather
+ than pointing to a maintainers home directory : the maintainer for a package
+ sometimes changes -->
+
 <sect1 id="perl-modules" xreflabel="Perl modules">
   <?dbhtml filename="perl-modules.html" ?>
@@ -191,6 +197,16 @@
 MD5 sum: &Archive-Zip-md5sum;</literallayout>
         <itemizedlist>
-          <listitem><literallayout><ulink url="http://search.cpan.org/~gfranks/Test-MockModule/">Test::MockModule</ulink>
-(http://search.cpan.org/~gfranks/Test-MockModule/)</literallayout>
+          <listitem><literallayout><ulink url="http://search.cpan.org/dist/Test-MockModule/">Test::MockModule</ulink> - This uses the <xref linkend="perl-build-install"/>
+(http://search.cpan.org/dist/Test-MockModule/)</literallayout>
+            <itemizedlist>
+              <listitem> <literallayout><ulink url="http://search.cpan.org/dist/SUPER/">SUPER</ulink>
+(http://search.cpan.org/dist/SUPER/) (for the testsuite)</literallayout>
+                <itemizedlist>
+                  <listitem><literallayout><ulink url="http://search.cpan.org/dist/Sub-Identify/">Sub-Identify</ulink>
+(http://search.cpan.org/dist/Sub-Identify/)(for the testsuite)</literallayout>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </itemizedlist>
           </listitem>
         </itemizedlist>
@@ -847,4 +863,12 @@
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/CPAN-Meta-Check/">CPAN::Meta::Check</ulink>
 (http://search.cpan.org/dist/CPAN::Meta::Check/) (for the testsuite)</literallayout>
+                <itemizedlist>
+<!-- FIXME : this duplicates the details for Test-Deep which is also needed by
+ Module-Metadata (below) : that (not _this_ one) can probably go after a
+ reasonable length of time -->
+                  <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Test-Deep/">Test::Deep</ulink>
+(http://search.cpan.org/dist/Test::Deep/) (for the testsuite)</literallayout>
+                  </listitem>
+                </itemizedlist>
               </listitem>
               <listitem> <literallayout><ulink url="http://search.cpan.org/dist/Module-Metadata/">Module::Metadata</ulink>
Index: general/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision ba8cf0e7064c0c1589260307a3e2f728e053f02d)
+++ general/sysutils/unrar.xml	(revision cecac4d5ef0fb7008442dc4ccce6fdeecfbef505)
@@ -7,5 +7,5 @@
   <!ENTITY unrar-download-http "http://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
   <!ENTITY unrar-download-ftp  " ">
-  <!ENTITY unrar-md5sum        "2bc61f5dd66d019ea938b64481620173">
+  <!ENTITY unrar-md5sum        "4a29cc1b47ced82db11e06090a95ed51">
   <!ENTITY unrar-size          "220 KB">
   <!ENTITY unrar-buildsize     "2.4 MB">
