Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 3d9b01d23fb59b957e9567763dec5783e170b955)
+++ xsoft/office/libreoffice.xml	(revision c1e721810725dec33bedaa93291abd4e25764a28)
@@ -8,22 +8,22 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "56ffec862a6dc2ae19d74e71260e8155">
-  <!ENTITY libreoffice-core-size          "220 MB">
+  <!ENTITY libreoffice-core-md5sum        "f108ef122e12b75dc22b72694e908fd2">
+  <!ENTITY libreoffice-core-size          "221 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "1725344526c665aa0ae314f4d9b025a5">
+  <!ENTITY libreoffice-dict-md5sum        "5cdcfd205c8ce157b69519ce6f162562">
   <!ENTITY libreoffice-dict-size          "44 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "ba605ba5ec67d8dc432afb0ced3e98b1">
-  <!ENTITY libreoffice-help-size          "85 MB">
+  <!ENTITY libreoffice-help-md5sum        "feca54db781d9befe845d3af8edec955">
+  <!ENTITY libreoffice-help-size          "84 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "5b3a73f13997aea3359ada5bb4d2659b">
+  <!ENTITY libreoffice-translations-md5sum        "0c2c0986ee47baf2fab8a2da18e0d89f">
   <!ENTITY libreoffice-translations-size          "165 MB">
 
   <!-- full size remeasured for 6.4.0.3 -->
 
-  <!ENTITY libreoffice-buildsize  "8.9 GB including the additional files if downloaded during the build (826 MB installed). Installing the whole set of languages for 6.4.0.3 required up to 25 GB (3.2 GB installed)">
+  <!ENTITY libreoffice-buildsize  "9 GB including the additional files if downloaded during the build (841 MB installed). Installing the whole set of languages for 6.4.0.3 required up to 25 GB (3.2 GB installed)">
 
  <!-- Editors: many updates to poppler will break LO using system poppler until
@@ -43,5 +43,5 @@
        a good domestic internet connection.  Total time was 60 SBU - ken
   -->
-  <!ENTITY libreoffice-time "64 SBU with parallelism=4 including typical download time">
+  <!ENTITY libreoffice-time "56 SBU with parallelism=4 including typical download time">
 
 ]>
@@ -272,4 +272,5 @@
       <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://include-what-you-use.org/">iwyu</ulink>,
+      <ulink url="https://github.com/junit-team/junit4/releases">junit4</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
@@ -570,7 +571,8 @@
     <para>
       <parameter>--without-junit</parameter>: This switch disables the tests
-      for the deprecated HSQLDB driver which is written in Java. If you wish
+      for the deprecated HSQLDB driver which is written in Java.
+      <!-- If you wish
       to build this driver replace this switch with the set of switches
-      described below after '--without-java'.
+      described below after '- -without-java'.-->
     </para>
 
@@ -696,11 +698,12 @@
       <application>base</application>.
     </para>
-
-    <para>
-      <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option> and
-      <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>:
+    <!-- junit is not included anymore in ant, and neither hamcrest. Since
+    the hsqldb backend is deprecated anyway, forget this:
+    <para>
+      <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option> and
+      <option>- -with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>:
       Those options are needed if you want to run the tests.
     </para>
-
+    -->
     <para>
       <option>--without-fonts</option>: <application>LibreOffice</application>
@@ -720,5 +723,5 @@
     </para>
     
-    <para revision="systemd">
+    <para>
       <option>--enable-evolution2</option>: Enables support for Evolution
       address books through Evolution Data Server. Note that Evolution Data
@@ -761,6 +764,5 @@
         </seg>
         <seg>
-          $LO_PREFIX/lib/libreoffice and
-          /usr/share/application-registry
+          $LO_PREFIX/lib/libreoffice
         </seg>
       </seglistitem>
