diff --git a/classes/cmake-auto-align-paths.bbclass b/classes/cmake_auto_align_paths.bbclass
similarity index 100%
rename from classes/cmake-auto-align-paths.bbclass
rename to classes/cmake_auto_align_paths.bbclass
diff --git a/classes/cmake-extra-sanity.bbclass b/classes/cmake_extra_sanity.bbclass
similarity index 62%
rename from classes/cmake-extra-sanity.bbclass
rename to classes/cmake_extra_sanity.bbclass
index 8aaf0911..6b019611 100644
--- a/classes/cmake-extra-sanity.bbclass
+++ b/classes/cmake_extra_sanity.bbclass
@@ -1,3 +1,5 @@
+inherit cmake_sysroot
+
 # do_install_append_class-cross does not work so hack
 do_install_prepend_class-native() {
     no_staging_check=true
@@ -34,6 +36,7 @@ do_install_append() {
                 bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi
+
         done
 
         if [ x != x$error ] ; then
@@ -41,3 +44,28 @@ do_install_append() {
         fi
     fi
 }
+
+do_populate_sysroot[postfuncs] += "do_sysroot_cmake_sanity "
+
+# check sysroot cmake files for links not relative and not to sysroots
+
+do_sysroot_cmake_sanity() {
+    error=
+    for f in `cat ${CMAKEINSTALLED}` ; do
+        if grep -q ';${libdir}' "$f" ; then
+            bbwarn "$f contains links to ${libdir}!"
+            error=true
+        fi
+        if grep -q ';${includedir}' "$f" ; then
+            bbwarn "$f contains links to ${includedir}!"
+            error=true
+        fi
+        if grep -q '\"${includedir}' "$f" ; then
+            bbwarn "$f contains links to ${includedir}!"
+            error=true
+        fi
+    done
+    if [ x != x$error ] ; then
+        bbfatal "One or more files in sysroot contain links to ${prefix}"
+    fi
+}
diff --git a/classes/cmake-lib.bbclass b/classes/cmake_lib.bbclass
similarity index 92%
rename from classes/cmake-lib.bbclass
rename to classes/cmake_lib.bbclass
index 9cc05682..3444ded6 100644
--- a/classes/cmake-lib.bbclass
+++ b/classes/cmake_lib.bbclass
@@ -55,9 +55,7 @@
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
 
-
-# filename for the file containg full names of all cmakefiles staged
-CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
+inherit cmake_sysroot
 
 # global helper to get CMAKE_ALIGN_SYSROOT array
 def get_align_flags(d):
@@ -89,25 +87,10 @@ python () {
             if num != 3:
                 bb.fatal('CMAKE_ALIGN_SYSROOT[%s] requires 3 parameters (dir, search, replace) in %s' % (flag, pn))
     else:
-        bb.fatal('The recipe %s inherits cmake-lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
+        bb.fatal('The recipe %s inherits cmake_lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
 }
 
-# 2. remove tmp file from last build
-python do_populate_sysroot_prepend() {
-    tmpfile = d.getVar('CMAKEINSTALLED', True)
-    if os.path.isfile(tmpfile):
-        os.remove(tmpfile)
-}
-
-# 3. keep cmake files staged to sysroot
-sysroot_stage_dir_append() {
-    # avoid doubles causing double replacement
-    for file in `find $dest -name '*.cmake'`; do
-        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
-            echo "$file" >> ${CMAKEINSTALLED}
-        fi
-    done
-}
+# 2. 3. in cmake_sysroot
 
 # 4. Handle CMAKE_ALIGN_SYSROOT
 python do_populate_sysroot_append() {
diff --git a/classes/cmake-native-dummy.bbclass b/classes/cmake_native_dummy.bbclass
similarity index 100%
rename from classes/cmake-native-dummy.bbclass
rename to classes/cmake_native_dummy.bbclass
diff --git a/classes/cmake_sysroot.bbclass b/classes/cmake_sysroot.bbclass
new file mode 100644
index 00000000..7a57a528
--- /dev/null
+++ b/classes/cmake_sysroot.bbclass
@@ -0,0 +1,22 @@
+# class to keep cmake files staged to sysroot for modifications/checks
+
+# filename for the file containg full names of all cmakefiles staged
+CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
+
+# 1. remove tmp file from last build
+python do_populate_sysroot_prepend() {
+    tmpfile = d.getVar('CMAKEINSTALLED', True)
+    if os.path.isfile(tmpfile):
+        os.remove(tmpfile)
+}
+
+# 2. keep cmake files staged to sysroot
+sysroot_stage_dir_append() {
+    # avoid doubles causing double replacement
+    for file in `find $dest -name '*.cmake'`; do
+        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
+            echo "$file" >> ${CMAKEINSTALLED}
+        fi
+    done
+}
+
diff --git a/classes/hawaii.bbclass b/classes/hawaii.bbclass
index 958ebd6d..dcf28107 100644
--- a/classes/hawaii.bbclass
+++ b/classes/hawaii.bbclass
@@ -2,7 +2,7 @@ SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols extra-cmake-modules-native"
 
-inherit cmake_qt5 cmake-extra-sanity pkgconfig
+inherit cmake_qt5 cmake_extra_sanity pkgconfig
 
 EXTRA_OECMAKE += " \
     -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass
index 759c0d4c..6f966a96 100644
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -17,7 +17,7 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5 cmake-extra-sanity pythonnative
+inherit cmake_qt5 cmake_extra_sanity pythonnative
 
 do_compile_prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}
diff --git a/classes/lxqt.bbclass b/classes/lxqt.bbclass
index af837a1f..ea38557c 100644
--- a/classes/lxqt.bbclass
+++ b/classes/lxqt.bbclass
@@ -1,4 +1,4 @@
-inherit cmake_qt5 cmake-extra-sanity qt5-translation
+inherit cmake_qt5 cmake_extra_sanity qt5-translation
 
 HOMEPAGE = "http://lxqt.org/"
 
diff --git a/extends-meta-qt5/qttools_git.bbappend b/extends-meta-qt5/qttools_git.bbappend
index c4b4cf49..f849e946 100644
--- a/extends-meta-qt5/qttools_git.bbappend
+++ b/extends-meta-qt5/qttools_git.bbappend
@@ -1,9 +1,9 @@
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
 
-# It's really time for us to publish cmake-lib.bbclass
+# It's really time for us to publish cmake_lib.bbclass
 SRC_URI_remove = " \
     file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
diff --git a/recipes-hawaii/greenisland/greenisland.bb b/recipes-hawaii/greenisland/greenisland.bb
index 385b8cf0..d9c632a7 100644
--- a/recipes-hawaii/greenisland/greenisland.bb
+++ b/recipes-hawaii/greenisland/greenisland.bb
@@ -1,6 +1,6 @@
 require greenisland.inc
 
-inherit cmake-lib cmake-auto-align-paths
+inherit cmake_lib cmake_auto_align_paths
 
 DEPENDS += " \
     ${BPN}-native \
diff --git a/recipes-hawaii/libhawaii/libhawaii_git.bb b/recipes-hawaii/libhawaii/libhawaii_git.bb
index d70261c6..243265a2 100644
--- a/recipes-hawaii/libhawaii/libhawaii_git.bb
+++ b/recipes-hawaii/libhawaii/libhawaii_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
-inherit hawaii cmake-lib
+inherit hawaii cmake_lib
 
 PV = "0.6.90+git${SRCPV}"
 
diff --git a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
index e0202805..6d981a43 100644
--- a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
+++ b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit hawaii cmake-lib
+inherit hawaii cmake_lib
 
 DEPENDS += "dconf"
 
diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
index 2bea562c..14bde3b4 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += " \
     ${BPN}-native \
@@ -47,7 +47,8 @@ do_configure_append() {
 }
 
 # native executables
-CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed-native.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed-native.bb
index e27ba7c1..0e7c03df 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed-native.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed-native.bb
@@ -3,6 +3,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 CMAKE_DUMMY_BINARIES = "kjscmd5"
 
-inherit cmake-native-dummy
+inherit cmake_native_dummy
 
 
diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
index 6a61920f..138f07aa 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5-porting-aids cmake-lib
+inherit kde-kf5-porting-aids cmake_lib
 
 DEPENDS += " \
     ${BPN}-native \
diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
index 5b7e41da..3ed11e76 100644
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
index 9b6bba74..57106fdf 100644
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
diff --git a/recipes-kde/kf5/tier1/kwayland/kwayland.bb b/recipes-kde/kf5/tier1/kwayland/kwayland.bb
index e677c254..648226e3 100644
--- a/recipes-kde/kf5/tier1/kwayland/kwayland.bb
+++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5
+inherit kde-kf5 cmake_auto_align_paths
 
 DEPENDS += "wayland wayland-native"
 
diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
index 6eb02162..757bf0d2 100644
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5 cmake-auto-align-paths
+inherit kde-kf5 cmake_auto_align_paths cmake_lib
 
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}"
 
@@ -12,5 +12,7 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "ae52891201ea66b15d94a4f5a2717a5f"
 SRC_URI[sha256sum] = "b8228dddcc6487e234f81239bea7ca7ae261af8fef7b9e5d7a8b49aa3ac5d0dd"
 
+CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${includedir}, -s"
+
 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"
diff --git a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
index f7d1ab93..e030eb9d 100644
--- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
@@ -2,7 +2,7 @@ SUMMARY = "Qt wrapper for ModemManager API"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-inherit kde-kf5 pkgconfig cmake-auto-align-paths
+inherit kde-kf5 pkgconfig cmake_auto_align_paths
 
 DEPENDS += "modemmanager"
 
diff --git a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
index f6fdc4f2..d51abd9b 100644
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -2,7 +2,7 @@ SUMMARY = "Qt wrapper for NetworkManager API"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-inherit kde-kf5 pkgconfig cmake-auto-align-paths
+inherit kde-kf5 pkgconfig cmake_auto_align_paths
 
 DEPENDS += "networkmanager"
 
diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb
index 37386500..8a9aef86 100644
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb
index 0aec2a5b..6f1b7da9 100644
--- a/recipes-kde/kf5/tier2/kauth/kauth.bb
+++ b/recipes-kde/kf5/tier2/kauth/kauth.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1"
 
diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
index fdca47b3..75c0deff 100644
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit native cmake-lib
+inherit native cmake_lib
 
 DEPENDS += "libxslt-native libxml2-native karchive-native ki18n-native"
 
diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
index d1e126ac..d5fbc2c0 100644
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
@@ -2,7 +2,7 @@ require ${BPN}.inc
 
 DEPENDS += "${BPN}-native karchive ki18n libxslt libxml2"
 
-inherit cmake-lib
+inherit cmake_lib
 
 SRC_URI += " \
 	file://0005-set-meinproc5-executable-so-that-it-can-be-found-for.patch \
diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.bb b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
index 29e8811d..08d69e6a 100644
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.bb
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native karchive ki18n kcoreaddons kconfig kdoctools"
 
diff --git a/recipes-kde/kf5/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb
index e8c1403c..368dcea1 100644
--- a/recipes-kde/kf5/tier3/baloo/baloo.bb
+++ b/recipes-kde/kf5/tier3/baloo/baloo.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-kf5 cmake-auto-align-paths gtk-icon-cache
+inherit kde-kf5 cmake_auto_align_paths gtk-icon-cache
 
 DEPENDS += " \
     ki18n \
diff --git a/recipes-kde/kf5/tier3/kded/kded-native.bb b/recipes-kde/kf5/tier3/kded/kded-native.bb
index 41df4ec7..ec60463c 100644
--- a/recipes-kde/kf5/tier3/kded/kded-native.bb
+++ b/recipes-kde/kf5/tier3/kded/kded-native.bb
@@ -3,6 +3,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 CMAKE_DUMMY_BINARIES = "kded5"
 
-inherit cmake-native-dummy
+inherit cmake_native_dummy
 
 
diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb
index f8bf290a..7dc50036 100644
--- a/recipes-kde/kf5/tier3/kded/kded.bb
+++ b/recipes-kde/kf5/tier3/kded/kded.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5 cmake-lib
+inherit kde-kf5 cmake_lib
 
 DEPENDS += "${BPN}-native kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice"
 
diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
index a584982e..5d8031d9 100644
--- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
+++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 # required
 DEPENDS += " \
diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb
index 56ed6ed0..fe93ee43 100644
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5 cmake-auto-align-paths
+inherit kde-kf5 cmake_auto_align_paths
 
 DEPENDS += " \
     qttools-native \
diff --git a/recipes-kde/other/libqapt/files/0001-include-random-for-std-default_random_engine.patch b/recipes-kde/other/libqapt/files/0001-include-random-for-std-default_random_engine.patch
new file mode 100644
index 00000000..76cb1ebc
--- /dev/null
+++ b/recipes-kde/other/libqapt/files/0001-include-random-for-std-default_random_engine.patch
@@ -0,0 +1,25 @@
+From a58eab74ee9881d10e0f24a3ed216ed71ba03bf5 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sun, 15 May 2016 16:26:28 +0200
+Subject: [PATCH] include <random> for std::default_random_engine
+
+apparently it was implicitly pulled by other (apt?) headers
+---
+ src/package.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/package.cpp b/src/package.cpp
+index 1e43a28..0526f9d 100644
+--- a/src/package.cpp
++++ b/src/package.cpp
+@@ -46,6 +46,7 @@
+ #include <apt-pkg/versionmatch.h>
+ 
+ #include <algorithm>
++#include <random>
+ 
+ // Own includes
+ #include "backend.h"
+-- 
+2.5.5
+
diff --git a/recipes-kde/other/libqapt/libqapt_3.0.1.bb b/recipes-kde/other/libqapt/libqapt_3.0.2.bb
similarity index 72%
rename from recipes-kde/other/libqapt/libqapt_3.0.1.bb
rename to recipes-kde/other/libqapt/libqapt_3.0.2.bb
index 68aa391d..f2bf2a39 100644
--- a/recipes-kde/other/libqapt/libqapt_3.0.1.bb
+++ b/recipes-kde/other/libqapt/libqapt_3.0.2.bb
@@ -28,12 +28,13 @@ DEPENDS += " \
     glib-2.0 \
 "
 
-SRC_URI[md5sum] = "91016b23f2c30b2a59a8a5c9c2558781"
-SRC_URI[sha256sum] = "19aeb20f8a9a0c7377f21e3d03d2319aa80348561872938363c540cb6340b97c"
+SRC_URI[md5sum] = "638a3d8244efe0e8fa99375a5660fd3c"
+SRC_URI[sha256sum] = "e0fa67518601fcde2c45aa613261022f2cfada54d3e1ea3cf0540805ba6663f3"
+SRC_URI += "file://0001-include-random-for-std-default_random_engine.patch"
 
 do_configure_append() {
     # apt sets absolute paths - we should fix that at apt...
-    sed -i 's:${STAGING_LIBDIR}/::g' ${B}/CMakeFiles/Export/_usr/lib/cmake/QApt/QAptTargets.cmake
+    sed -i 's:${STAGING_LIBDIR}/::g' ${B}/CMakeFiles/Export/lib/cmake/QApt/QAptTargets.cmake
 }
 
 FILES_${PN} += " \
diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
index 9326ac81..d4d021d4 100644
--- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
+++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "PolicyKit Qt wrapper"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7dbc59dc445b2261c4fb2f9466e3446a"
 
-inherit kde-base cmake-lib
+inherit kde-base cmake_lib
 
 DEPENDS += "polkit glib-2.0"
 
diff --git a/recipes-kde/other/qca/qca_2.1.1.bb b/recipes-kde/other/qca/qca_2.1.1.bb
index 898cbf08..1a09b1a9 100644
--- a/recipes-kde/other/qca/qca_2.1.1.bb
+++ b/recipes-kde/other/qca/qca_2.1.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
 "
 
-inherit kde-base
+inherit kde-base cmake_auto_align_paths
 
 # TBD: PACKAGECONFIG
 DEPENDS += " \
@@ -25,4 +25,3 @@ SRC_URI += " \
 EXTRA_OECMAKE += "-DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/features"
 
 FILES_${PN} += "${libdir}/qca-qt5/crypto"
-FILES_${PN}-dbg += "${libdir}/qca-qt5/crypto/.debug"
diff --git a/recipes-lxqt/libfm-qt/libfm-qt_git.bb b/recipes-lxqt/libfm-qt/libfm-qt_git.bb
index 41d9f6d5..961a7edc 100644
--- a/recipes-lxqt/libfm-qt/libfm-qt_git.bb
+++ b/recipes-lxqt/libfm-qt/libfm-qt_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit lxqt cmake-lib pkgconfig distro_features_check
+inherit lxqt cmake_lib pkgconfig distro_features_check
 
 DEPENDS += "qtx11extras glib-2.0 libfm menu-cache"
 
diff --git a/recipes-lxqt/liblxqt/liblxqt_git.bb b/recipes-lxqt/liblxqt/liblxqt_git.bb
index 8ab28aac..4c01a3f8 100644
--- a/recipes-lxqt/liblxqt/liblxqt_git.bb
+++ b/recipes-lxqt/liblxqt/liblxqt_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Core utility library for all LXQt components"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
 
-inherit lxqt cmake-lib
+inherit lxqt cmake_lib
 
 DEPENDS += "libqtxdg kwindowsystem"
 SRC_URI += "file://0001-remove-Qt5X11Extras-dependency-it-is-not-required.patch"
diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb
index 4c8a1845..b08755c2 100644
--- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb
+++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "libqtxdg is An Qt implementation of freedesktop.org xdg specification
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6"
 
-inherit lxqt cmake-lib
+inherit lxqt cmake_lib
 
 # libmagic is supplied by file
 DEPENDS += "file"
diff --git a/recipes-lxqt/libsysstat/libsysstat_git.bb b/recipes-lxqt/libsysstat/libsysstat_git.bb
index ce0c82f1..9053315a 100644
--- a/recipes-lxqt/libsysstat/libsysstat_git.bb
+++ b/recipes-lxqt/libsysstat/libsysstat_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Library used to query system info and statistics "
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
 
-inherit lxqt cmake-lib
+inherit lxqt cmake_lib
 
 SRCREV = "7b173f36872f5943792b61ef760ee3ed8da4e3ae"
 PV = "0.3.1"
diff --git a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
index 0c5d9bbd..07352132 100644
--- a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
+++ b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Daemon used to register global keyboard shortcuts"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
 
-inherit lxqt cmake-lib distro_features_check
+inherit lxqt cmake_lib distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/recipes-lxqt/qterminal/qterminal_git.bb b/recipes-lxqt/qterminal/qterminal_git.bb
index 3dde2f9f..b776002b 100644
--- a/recipes-lxqt/qterminal/qterminal_git.bb
+++ b/recipes-lxqt/qterminal/qterminal_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Lightweight terminal emulator written in Qt"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit cmake_qt5 cmake-extra-sanity distro_features_check
+inherit cmake_qt5 cmake_extra_sanity distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
diff --git a/recipes-lxqt/qtermwidget/qtermwidget_git.bb b/recipes-lxqt/qtermwidget/qtermwidget_git.bb
index 214e9054..95ffc322 100644
--- a/recipes-lxqt/qtermwidget/qtermwidget_git.bb
+++ b/recipes-lxqt/qtermwidget/qtermwidget_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "The qterminal widget"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit cmake_qt5 cmake-lib cmake-extra-sanity
+inherit cmake_qt5 cmake_lib cmake_extra_sanity
 
 DEPENDS = "qtbase"
 
diff --git a/recipes-misc/recipes-graphics/sddm/sddm_git.bb b/recipes-misc/recipes-graphics/sddm/sddm_git.bb
index 546fb149..ca8a8fe1 100644
--- a/recipes-misc/recipes-graphics/sddm/sddm_git.bb
+++ b/recipes-misc/recipes-graphics/sddm/sddm_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit cmake_qt5 cmake-extra-sanity pkgconfig systemd useradd distro_features_check
+inherit cmake_qt5 cmake_extra_sanity pkgconfig systemd useradd distro_features_check
 
 DEPENDS += "qtbase qtdeclarative qttools-native libxcb"
 # REVISIT optionals
diff --git a/recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb b/recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb
index c98b0c34..1ac91e7c 100644
--- a/recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb
+++ b/recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb
@@ -3,7 +3,7 @@ SUMMARY = "QtGStreamer is a set of libraries providing C++ bindings for GStreame
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-inherit cmake_qt5  cmake-lib
+inherit cmake_qt5  cmake_lib
 
 DEPENDS += " \
     boost \
diff --git a/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb b/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb
index cbc792b8..0d177f0f 100644
--- a/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb
+++ b/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/libdbu
 SRC_URI[md5sum] = "8b90312bd8654e026d814d4db986ce5e"
 SRC_URI[sha256sum] = "a8e6358a31c44ccdf1bfc46c95a77a6bfc7fc1f536aadb913ed4f4405c570cf6"
 
-inherit cmake_qt5 cmake-extra-sanity
+inherit cmake_qt5 cmake_extra_sanity
 
 S = "${WORKDIR}/libdbusmenu-qt-${PV}"
 
diff --git a/recipes-support/xapian/xapian-core_1.4.0.bb b/recipes-support/xapian/xapian-core_1.4.0.bb
index 83a3f0b5..70c08898 100644
--- a/recipes-support/xapian/xapian-core_1.4.0.bb
+++ b/recipes-support/xapian/xapian-core_1.4.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://oligarchy.co.uk/xapian/${PV}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "5308261e78337604bd8f845dd6b4aafc"
 SRC_URI[sha256sum] = "10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477"
 
-inherit autotools cmake-lib
+inherit autotools cmake_lib
 
 DEPENDS = "util-linux zlib"