Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 x11/colord/BUILD   |    6 +++---
 x11/colord/DEPENDS |   20 ++++++++++----------
 x11/colord/DETAILS |    1 +
 x11/colord/HISTORY |    3 +++
 x11/colord/INSTALL |    2 --
 5 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit dd88154f42084658a93e326823dc3e8e1352f68e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/colord: use meson functions from grimoire

diff --git a/x11/colord/BUILD b/x11/colord/BUILD
index 09fa6e8..19edc0d 100755
--- a/x11/colord/BUILD
+++ b/x11/colord/BUILD
@@ -1,3 +1,3 @@
-OPTS="$OPTS -Dlibcolordcompat=true" &&
-meson build --prefix=$INSTALL_ROOT/usr $OPTS &&
-ninja -C build
+. "${GRIMOIRE}/MESON_FUNCTIONS"
+OPTS="$OPTS libcolordcompat=true" &&
+default_build
diff --git a/x11/colord/DEPENDS b/x11/colord/DEPENDS
index 7b348ba..96ce8c3 100755
--- a/x11/colord/DEPENDS
+++ b/x11/colord/DEPENDS
@@ -10,26 +10,26 @@ depends policykit     &&
 depends sqlite        &&
 
 optional_depends bash \
-                 '-Dbash=true' \
-                 '-Dbash=false' \
+                 'bash_completion=true' \
+                 'bash_completion=false' \
                  'install bash completion' &&
 
 optional_depends vala \
-                 '-Dvapi=true' \
-                 '-Dvapi=false' \
+                 'vapi=true' \
+                 'vapi=false' \
                  'build vala bindings' &&
 
 optional_depends argyllcms \
-                 '-Dargyllcms_sensor=true' \
-                 '-Dargyllcms_sensor=false' \
+                 'argyllcms_sensor=true' \
+                 'argyllcms_sensor=false' \
                   'ArgllCMS sensor' &&
 
 optional_depends systemd \
-                 '-Dsystemd=true' \
-                 '-Dsystemd=false' \
+                 'systemd=true' \
+                 'systemd=false' \
                  'SystemD support' &&
 
 optional_depends sane-backends \
-                 "-Dsane=true" \
-                 "-Dsane=false" \
+                 "sane=true" \
+                 "sane=false" \
                  "for scanner support"
diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index 39e81ee..b88f28c 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=colord
          VERSION=1.4.3
           SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 377af9e..67068a2 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,5 +1,8 @@
 2018-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, INSTALL: fix dependencies and installation
+       * INSTALL: removed
+       * DETAILS, BUILD: use meson functions from grimoire
+       * DEPENDS: fix optional dependencies, for real this time
 
 2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.4.3
diff --git a/x11/colord/INSTALL b/x11/colord/INSTALL
deleted file mode 100755
index dce29c4..0000000
--- a/x11/colord/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd build &&
-ninja install