Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/ark.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY ark-download-http "&kde-download-http;applications/&ark-version;/src/ark-&ark-version;.tar.xz">
+  <!ENTITY ark-download-http "&kde-download-attic;/&ark-version;/src/ark-&ark-version;.tar.xz">
   <!ENTITY ark-download-ftp  " ">
-  <!ENTITY ark-md5sum        "2fe131a931d51603eff33b80d45a73b7">
-  <!ENTITY ark-size          "248 KB">
-  <!ENTITY ark-buildsize     "11.4 MB">
-  <!ENTITY ark-time          "1.1 SBU">
+  <!ENTITY ark-md5sum        "e262d982aa4ce30da47a416d76c0c96e">
+  <!ENTITY ark-size          "236 KB">
+  <!ENTITY ark-buildsize     "10.1 MB">
+  <!ENTITY ark-time          "0.4 SBU">
 ]>
 
@@ -32,5 +32,5 @@
     <para>This package provides an archiving utility for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/gwenview.xml
===================================================================
--- kde/add/gwenview.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/gwenview.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>Gwenview is a fast and easy-to-use image viewer for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kate.xml
===================================================================
--- kde/add/kate.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/kate.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -34,5 +34,5 @@
       programming and scripting languages. KWrite is the lightweight cousin of Kate.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/kdepim-runtime.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kdepim-runtime-download-http "http://ftp.osuosl.org/pub/blfs/conglomeration/kdepim-runtime//kdepim-runtime-&kdepim-version;.tar.xz">
+  <!ENTITY kdepim-runtime-download-http "&kde-download-attic;/15.04.3/src/kdepim-runtime-&kdepim-version;.tar.xz">
   <!ENTITY kdepim-runtime-download-ftp  " ">
   <!ENTITY kdepim-runtime-md5sum        "7dd2063acf9b6920920d0118f5576db6">
@@ -33,5 +33,5 @@
     </para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/kdepim.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kdepim-download-http "http://ftp.osuosl.org/pub/blfs/conglomeration/kdepim//src/kdepim-&kdepim-version;.tar.xz">
+  <!ENTITY kdepim-download-http "&kde-download-attic;/15.04.3/src/kdepim-&kdepim-version;.tar.xz">
   <!ENTITY kdepim-download-ftp  " ">
   <!ENTITY kdepim-md5sum        "a09c9bd838cd71c16e9993e57653a7ad">
@@ -35,5 +35,5 @@
     and sticky notes.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/kdeplasma-addons.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     lancelot, calculator, wallpapers etc.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/kmix.xml
===================================================================
--- kde/add/kmix.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/kmix.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>This packages provides an audio mixer application for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/konsole.xml
===================================================================
--- kde/add/konsole.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/konsole.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>This package provides a terminal emulator for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/libkcddb.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/libkdcraw.xml
===================================================================
--- kde/add/libkdcraw.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/libkdcraw.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     picture files.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/libkexiv2.xml
===================================================================
--- kde/add/libkexiv2.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/libkexiv2.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     library for manipulating image metadata.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/okular.xml
===================================================================
--- kde/add/okular.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/add/okular.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     including PDF, PostScript, TIFF, Microsoft CHM, DjVu, DVI, XPS and ePub.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/akonadi.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -6,5 +6,5 @@
 
   <!ENTITY akonadi-download-http "&kde-download-http;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
-  <!ENTITY akonadi-download-ftp  "&kde-download-ftp;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
+  <!ENTITY akonadi-download-ftp  " ">
   <!ENTITY akonadi-md5sum        "84eb2e471bd6bdfe54a2a2f1d858c07d">
   <!ENTITY akonadi-size          "287 KB">
@@ -35,5 +35,5 @@
     retrieval.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/attica.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -6,5 +6,5 @@
 
   <!ENTITY attica-download-http "&kde-download-http;attica/attica-&attica-version;.tar.bz2">
-  <!ENTITY attica-download-ftp  "&kde-download-ftp;attica/attica-&attica-version;.tar.bz2">
+  <!ENTITY attica-download-ftp  " ">
   <!ENTITY attica-md5sum        "d62c5c9489a68432e8d990dde7680c24">
   <!ENTITY attica-size          "59 KB">
@@ -33,5 +33,5 @@
     "Open Collaboration Service" providers.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/automoc4.xml
===================================================================
--- kde/core/automoc4.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/automoc4.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -6,5 +6,5 @@
 
   <!ENTITY automoc4-download-http "&kde-download-http;automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
-  <!ENTITY automoc4-download-ftp  "&kde-download-ftp;automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
+  <!ENTITY automoc4-download-ftp  " ">
   <!ENTITY automoc4-md5sum        "91bf517cb940109180ecd07bc90c69ec">
   <!ENTITY automoc4-size          "0.9 MB">
@@ -34,5 +34,5 @@
     <application>CMake</application> as the buildsystem.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/baloo-widgets.xml
===================================================================
--- kde/core/baloo-widgets.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/baloo-widgets.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>Baloo-widgets contains widgets for the baloo search framework.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/baloo.xml
===================================================================
--- kde/core/baloo.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/baloo.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>Baloo is a framework for searching and managing metadata.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kactivities.xml
===================================================================
--- kde/core/kactivities.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kactivities.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY kactivities-download-http "&kde-download-http;&kactivities-version;/src/kactivities-&kactivities-version;.tar.xz">
-  <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kactivities-version;/src/kactivities-&kactivities-version;.tar.xz">
+  <!ENTITY kactivities-download-http "&kde-download-attic2;/4.13.3/src/kactivities-&kactivities-version;.tar.xz">
+  <!ENTITY kactivities-download-ftp  " ">
   <!ENTITY kactivities-md5sum        "e56a3aead6f418d973c0acd9c889deb8">
   <!ENTITY kactivities-size          "88 KB">
@@ -32,5 +32,5 @@
     <para>This package provides the activitymanager for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kde-base-artwork.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>This package provides the default splash screen for KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kde-baseapps.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -34,5 +34,5 @@
     libraries are also provided.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +75,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="tidy-html"/> and
+<!--    <xref linkend="tidy-html"/> and
+     NOt compatible with the latest tidy.
+-->
     <xref linkend="glib2"/>
     </para>
@@ -97,4 +99,5 @@
       -DCMAKE_BUILD_TYPE=Release           \
       -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
+      -DWITH_LibTidy=OFF                   \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kde-runtime.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     for <application>KDE</application>.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kde-workspace.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY kde-workspace-download-http "&kde-download-http;applications/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;applications/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-http "&kde-download-attic;/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  " ">
   <!ENTITY kde-workspace-md5sum        "bd7fa9c894dda23e8d06fc6a49a561cf">
   <!ENTITY kde-workspace-size          "12.9 MB">
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,5 +145,9 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -e '/graphics.*TESTNAME/s/-signalplottertest/&amp;2/' \
+    -e '/test TESTNAME/s/-signalplottertest/&amp;3/'      \
+    -i libs/ksysguard/tests/CMakeLists.txt
+
+mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kdelibs.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -33,5 +33,5 @@
     are central to development and execution of KDE programs.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kdepimlibs.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kdepimlibs-download-http "&kde-download-http;applications/15.04.3/src/kdepimlibs-&kdepim-version;.tar.xz">
+  <!ENTITY kdepimlibs-download-http "&kde-download-attic;/15.04.3/src/kdepimlibs-&kdepim-version;.tar.xz">
   <!ENTITY kdepimlibs-download-ftp  " ">
   <!ENTITY kdepimlibs-md5sum        "098c975fb970621dc8382ed3c28de0eb">
@@ -34,5 +34,5 @@
     <command>kmail</command>, <command>kalarm</command>, etc.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kfilemetadata.xml
===================================================================
--- kde/core/kfilemetadata.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/kfilemetadata.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -32,5 +32,5 @@
     <para>Kfilemetadata is a framework for searching and managing metadata.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/polkit-kde-agent.xml
===================================================================
--- kde/core/polkit-kde-agent.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/polkit-kde-agent.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -6,5 +6,5 @@
 
   <!ENTITY polkit-kde-agent-download-http "&kde-download-http;apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
-  <!ENTITY polkit-kde-agent-download-ftp  "&kde-download-ftp;apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
+  <!ENTITY polkit-kde-agent-download-ftp  " ">
   <!ENTITY polkit-kde-agent-md5sum        "a02d3fddc6270a88bceaf3ba604c92f8">
   <!ENTITY polkit-kde-agent-size          "34 KB">
@@ -34,5 +34,5 @@
     for performing administrative tasks in KDE.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/qimageblitz.xml
===================================================================
--- kde/core/qimageblitz.xml	(revision 2b2671b03a8b538aac7af63c8fb46bb3cca329d5)
+++ kde/core/qimageblitz.xml	(revision 1cc534573c235b5a5cb347dc440489a6c04c835e)
@@ -6,5 +6,5 @@
 
   <!ENTITY qimageblitz-download-http "&kde-download-http;qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
-  <!ENTITY qimageblitz-download-ftp  "&kde-download-ftp;qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
+  <!ENTITY qimageblitz-download-ftp  " ">
   <!ENTITY qimageblitz-md5sum        "0ae2f7d4e0876764a97ca73799f61df4">
   <!ENTITY qimageblitz-size          "57 KB">
@@ -33,5 +33,5 @@
     filter library for <application>KDE</application>.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
