Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 ChangeLog                    |    3 +++
 qt5-cmake/FUNCTIONS          |    7 -------
 qt5-cmake/qtkeychain/DEPENDS |    8 ++++++--
 qt5-cmake/qtkeychain/HISTORY |    3 +++
 4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 15051d3afb4a8722c7dc3f4e8ab84ce3494d5c77
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt5-cmake/FUNCTIONS:  tweak

commit e7b1d7a6b4e689189e6f69f5f88364bb14b37a57
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qtkeychain - add qt6 support

diff --git a/ChangeLog b/ChangeLog
index 1b55a3f..c2660ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2022-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * qt5-cmake/FUNCTIONS: simplify
+
 2022-05-23 Ismael Luceno <ismael AT sourcemage.org>
        * libs/skalibs: new spell, C development files used for building
          all software at skarnet.org
diff --git a/qt5-cmake/FUNCTIONS b/qt5-cmake/FUNCTIONS
index 5458614..0f2378c 100755
--- a/qt5-cmake/FUNCTIONS
+++ b/qt5-cmake/FUNCTIONS
@@ -1,10 +1,3 @@
 . $GRIMOIRE/KDE5_FUNCTIONS
-default_build() {
-  qt5_cmake_build
-}
-
-function default_install() {
- cmake_install
-}
 
 
diff --git a/qt5-cmake/qtkeychain/DEPENDS b/qt5-cmake/qtkeychain/DEPENDS
index 5417cac..ea1c691 100755
--- a/qt5-cmake/qtkeychain/DEPENDS
+++ b/qt5-cmake/qtkeychain/DEPENDS
@@ -1,4 +1,8 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-depends qttools &&
+source $GRIMOIRE/KDE5_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+  depends qt6tools
+else
+  depends qttools
+fi
 optional_depends kwallet5  '' '' 'KDE support' &&
 optional_depends libsecret -DLIBSECRET_SUPPORT={ON,OFF} 'Gnome keyring 
support'
diff --git a/qt5-cmake/qtkeychain/HISTORY b/qt5-cmake/qtkeychain/HISTORY
index 8089932..1161dbb 100644
--- a/qt5-cmake/qtkeychain/HISTORY
+++ b/qt5-cmake/qtkeychain/HISTORY
@@ -1,3 +1,6 @@
+2022-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: add qt6 support
+
 2021-12-08 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.13.2