elogind: => 235.2

5 files changed, 28 insertions, 22 deletions

diff --git a/smgl/elogind/BUILD b/smgl/elogind/BUILD
index 2110619004..3053b7f48d 100755
--- a/smgl/elogind/BUILD
+++ b/smgl/elogind/BUILD
@@ -1,8 +1,10 @@
-OPTS+=' --disable-smack --disable-tests --enable-split-usr' &&
-OPTS+=' --with-rootlibdir=/lib' &&
-OPTS+=' --with-cgroup-controller=none' &&
+OPTS+=' smack=false tests=unsafe split-usr=true' &&
+OPTS+=' rootlibdir=/lib' &&
+#OPTS+=' halt-path=/sbin reboot-path=/sbin' &&
+OPTS+=' default-hierarchy=hybrid' &&
+OPTS+=' cgroup-controller=none' &&
 #if is_depends_enabled $SPELL simpleinit-msb;then
-#  OPTS+=' --with-cgroup-controller=simpleinit'
+#  OPTS+=' cgroup-controller=telinit'
 #fi &&
 default_build
 
diff --git a/smgl/elogind/DEPENDS b/smgl/elogind/DEPENDS
index 8b5e987d08..cbe3fac334 100755
--- a/smgl/elogind/DEPENDS
+++ b/smgl/elogind/DEPENDS
@@ -1,18 +1,21 @@
+depends ninja-build-system &&
+depends meson &&
 depends eudev   &&
 depends gperf   &&
 depends glib2   &&
-depends INIT    &&
+#depends INIT    &&
 depends libcap  &&
-depends libxslt &&
 depends perl    &&
-depends util-linux &&
-#depends simpleinit-msb ' --with-cgroup-controller=initctl' &&
+#depends util-linux &&
+depends simpleinit-msb 'cgroup-controller=telinit' &&
 
-#optional_depends gtk-doc    '--enable-gtk-doc' '--disable-gtk-doc' 'build docs' &&
-optional_depends intltool   '' '--disable-nls' 'NLS support' &&
-optional_depends libseccomp '' '--disable-seccomp' 'SECCOMP support' &&
-optional_depends libselinux '' '--disable-selinux' 'SELINUX support' &&
-optional_depends linux-pam  '' '--disable-pam' 'PAM support' &&
-optional_depends acl        '' '--disable-acl' 'ACL support' &&
-optional_depends policykit  '--enable-polkit' '--disable-polkit' 'PolicyKit support' &&
+optional_depends libxslt    'man=true' 'man=false' 'build man pages' &&
+optional_depends lxml       '' '' 'index  man pages' &&
+#optional_depends intltool   '' '--disable-nls' 'NLS support' &&
+#optional_depends libseccomp '' '--disable-seccomp' 'SECCOMP support' &&
+optional_depends libselinux 'selinux=true' 'selinux=false' 'SELINUX support' &&
+optional_depends linux-pam  'pam=true' 'pam=false' 'PAM support' &&
+optional_depends acl        'acl=true' 'acl=false' 'ACL support' &&
+optional_depends audit      'audit=true' 'audit=false'  'Audit support' &&
+optional_depends policykit  'polkit=true' 'polkit=false' 'PolicyKit support' &&
 runtime_depends dbus
diff --git a/smgl/elogind/DETAILS b/smgl/elogind/DETAILS
index 870941cd22..0c9123a9d9 100755
--- a/smgl/elogind/DETAILS
+++ b/smgl/elogind/DETAILS
@@ -1,6 +1,7 @@
+source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=elogind
-         VERSION=234.4
-     SOURCE_HASH=sha512:2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
+         VERSION=235.2
+     SOURCE_HASH=sha512:6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=https://github.com/elogind/elogind
diff --git a/smgl/elogind/HISTORY b/smgl/elogind/HISTORY
index 4b67ff5a1d..18e89e6c85 100644
--- a/smgl/elogind/HISTORY
+++ b/smgl/elogind/HISTORY
@@ -1,3 +1,8 @@
+2018-01-16 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 235.2
+	* BUILD DEPENDS: adapt to meson build
+	* PRE_BUILD: deleted
+
 2017-09-25 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 234.4
 
diff --git a/smgl/elogind/PRE_BUILD b/smgl/elogind/PRE_BUILD
deleted file mode 100755
index e9f15ccb5a..0000000000
--- a/smgl/elogind/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-#./autogen.sh
-intltoolize --force --automake
-autoreconf --force --install --symlink