Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision d39f814e6c145e685c0fc10add0a5013976d12b1)
+++ xsoft/office/libreoffice.xml	(revision 116f53b518efa37dd85be9c8f7b56998dabbf8a6)
@@ -8,38 +8,23 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "6145510261094a85a6cecaecefa10c94">
-  <!ENTITY libreoffice-core-size          "166 MB">
+  <!ENTITY libreoffice-core-md5sum        "cbe602264e58f7c93e72068c408e3551">
+  <!ENTITY libreoffice-core-size          "168 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "05188274ca5b5aac92f0321e4cf153d7">
-  <!ENTITY libreoffice-dict-size          "36 MB">
+  <!ENTITY libreoffice-dict-md5sum        "063b3218651a93198c8a558c6ab365cc">
+  <!ENTITY libreoffice-dict-size          "37 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "0ff7ef91f9f84d5a9a21e3bee72bdae7">
+  <!ENTITY libreoffice-help-md5sum        "f485479a135582f37335a92d773416fe">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "4075e99e6075fb7bd163a5f66e24c0f3">
+  <!ENTITY libreoffice-translations-md5sum        "a93714b74f1c04c534729a9511311886">
   <!ENTITY libreoffice-translations-size          "126 MB">
 
 
-  <!ENTITY libreoffice-buildsize          "9.1 GB (658 MB installed)">
-  <!ENTITY libreoffice-time               "52 SBU with parallelism = 4 + download time">
-
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installed
-  dependencies (with-system... -->
-
-  <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [bdubbs]  For version 4.4.2.1 Built on x86_64 using -\-with-parallelism=12 -->
-  <!-- [bdubbs]  For version 4.4.4.3 Built on x86_64 using -\-with-parallelism=12 -->
-  <!-- [fernando] For version 4.3.1.2 I've got, for i686, statistcs over the
-  upper bounds for x86_64 of previous versions, thus, temporarily, decided
-  to use single statistcs, instead of a range.-->
-  <!-- [fernando]  For version 4.4.4.3 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [fernando]  For version 5.0.0.5 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [fernando]  For version 5.0.4.2 Built on x86_64 using -\-with-parallelism=4 -->
-  <!-- [fernando]  For version 5.1.0.3 Built on x86_64 using -\-with-parallelism=4 -->
+  <!ENTITY libreoffice-buildsize          "7.9 GB (606 MB installed)">
+  <!ENTITY libreoffice-time               "45 SBU with parallelism = 4 + download time">
+
 ]>
 
@@ -289,37 +274,4 @@
   <sect2 role="installation">
     <title>Installation of LibreOffice</title>
-<!--
-    <warning>
-      <para>
-        Untaring the libreoffice-&libreoffice-dlversion; tarball as
-        <systemitem class="username">root</systemitem> has the curious effect of
-        changing the ownership of the <emphasis>parent</emphasis> directory
-        to a user with numerical id 11012 and with the permissions set to allow
-        read, write and execute for that user only! If you untared as
-        <systemitem class="username">root</systemitem> in your home folder you
-        could end up unable to log in again. If you untared it in
-        <filename class="directory">/usr</filename> you would find your user
-        account unable to access any file in
-        <filename class="directory">/usr</filename>.
-      </para>
-
-      <para>
-        You can avoid this unpleasantness by
-        <emphasis>not</emphasis> untaring it as
-        <systemitem class="username">root</systemitem>. If you must untar it as
-        <systemitem class="username">root</systemitem> pass the option
-        <option>-\-no-overwrite-dir</option> to tar. This is the default when you
-        untar as a user but has to be passed as an option when untaring as
-        <systemitem class="username">root</systemitem>:
-      </para>
-    </warning>-->
-
-    <!-- I was able to build over ssh 2015-03-24 - bdubbs
-    <note>
-      <para>
-      LibreOffice must be built in a graphical environment - the build will
-      fail otherwise.
-      </para>
-    </note>-->
 
     <important>
@@ -408,4 +360,5 @@
              --disable-dconf             \
              --disable-odk               \
+             --disable-firebird-sdbc     \
              --enable-release-build=yes  \
              --enable-python=system      \
@@ -443,6 +396,5 @@
 
     <para>
-      Build the package <!--(remember that it must be done in a graphical
-      environment)-->:
+      Build the package:
     </para>
 
@@ -518,7 +470,4 @@
       <command>sed -e ...</command>: The first sed prevents compression of the
       manual pages and the second one prevents install from failing.
-      <!-- and the third
-      one fixes a build failure caused by a
-      <application>glibc-2.23</application> change.-->
     </para>
 
@@ -596,4 +545,10 @@
       office development kit. Remove if you want to develop a
       <application>LibreOffice</application> based application.
+    </para>
+
+    <para>
+      <parameter>--disable-firebird-sdbc</parameter>: The bundled version
+      of Firebird does not build properly with GCC-6.<!-- Hope next version
+      will correct that -->
     </para>
 
