--- smage/trunk/core/systemd/systemd-239-r1.smage2	2018/08/20 13:46:21	12028
+++ smage/trunk/core/systemd/systemd-239-r1.smage2	2018/08/20 14:00:01	12029
@@ -8,7 +8,7 @@
 # 0=disable dev split packages
 ENABLE_DEV_PACKAGES="1"
 
-SPLIT_PACKAGES="libsystemd-shared libudev udev nss-myhostname libsystemd systemd-coredump systemd systemd-tools"
+SPLIT_PACKAGES="libsystemd-shared systemd-systemctl libudev udev nss-myhostname libsystemd systemd-coredump systemd systemd-tools"
 
 # dev packages
 if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
@@ -36,17 +36,17 @@
 # and this functions too
 SPECIAL_FUNCTIONS="pkg_setup"
 
-GLIB2_DEPEND=">= dev-libs/glib2-2.54"
+GLIB2_DEPEND=">= dev-libs/glib2-2.56"
 GLIBC_DEPEND=">= virtual/glibc"
-LIBGCC_DEPEND=">= sys-libs/libgcc-6.3"
+LIBGCC_DEPEND=">= sys-libs/libgcc-7.3"
 XZ_DEPEND=">= virtual/xz-utils"
 LIBGCRYPT_DEPEND=">= app-crypt/libgcrypt-1.8"
-LIBGPGERROR_DEPEND=">= app-crypt/libgpg-error-1.27"
+LIBGPGERROR_DEPEND=">= app-crypt/libgpg-error-1.31"
 LIBNOTIFY_DEPEND=">= x11-libs/libnotify-0.7"
 LIBGEE_DEPEND=">= dev-libs/libgee-0.20"
 LIBCAP_DEPEND=">= sys-libs/libcap-2.25"
 ELFUTILS_DEPEND=">= dev-libs/elfutils-libs-0.170"
-LIBBLKID_DEPEND=">= sys-libs/libblkid-2.30"
+LIBBLKID_DEPEND=">= sys-libs/libblkid-2.32"
 COMMON_DEPEND="${GLIBC_DEPEND}
 	${LIBGCC_DEPEND}
 	${LIBCAP_DEPEND}"
@@ -54,12 +54,13 @@
 DAEMON_DEPEND="${COMMON_DEPEND}
 	${GLIB2_DEPEND}
 	>= virtual/procps
-	>= sys-apps/util-linux-2.30
-	>= sys-apps/kmod-24"
+	>= sys-apps/util-linux-2.32
+	>= sys-apps/kmod-25"
 COREDUMP_DEPEND="${COMMON_DEPEND}
 	${LIBGCRYPT_DEPEND}
 	${LIBGPGERROR_DEPEND}
 	${ELFUTILS_DEPEND}"
+SYSTEMCTL_DEPEND="${COMMON_DEPEND}"
 
 LIBUDEV_DEPEND="${COMMON_DEPEND}"
 NSS_DEPEND="${COMMON_DEPEND}
@@ -80,21 +81,21 @@
 	${LIBGPGERROR_DEPEND}
 	>= sys-apps/mage-release-1
 	>= sys-apps/dbus-1.10
-	>= dev-libs/dbus-glib-0.108
+	>= dev-libs/dbus-glib-0.110
 	>= virtual/shadow"
 
 TOOLS_DEPEND=">= dev-python/python3-dbus-1.2
-	>= sys-apps/polkit-0.113"
+	>= sys-apps/polkit-0.114"
 
 UDEV_DEPEND="${DAEMON_DEPEND}
 	>= dev-libs/libusb-compat-0.1.4
 	>= virtual/usbutils
 	>= virtual/pciutils
-	>= sys-libs/libuuid-2.30
-	>= sys-fs/libgudev-230"
+	>= sys-libs/libuuid-2.32
+	>= sys-fs/libgudev-232"
 
 PYTHON_DEPEND=">= dev-lang/python3-3.6
-	>= dev-python/python3-lxml-3.5"
+	>= dev-python/python3-lxml-4.1"
 
 if [[ ${ENABLE_GTK} = 1 ]]
 then
@@ -120,6 +121,7 @@
 	${NSS_DEPEND}
 	${LIBSYSTEMD_DEPEND}
 	${LIBSYSTEMD_SHARED_DEPEND}
+	${SYSTEMCTL_DEPEND}
 	${SYSTEMD_DEPEND}
 	${TOOLS_DEPEND}
 	${UDEV_DEPEND}
@@ -129,9 +131,9 @@
 	>= app-text/docbook-xml-dtd42-4.2
 	>= app-text/docbook-xml-dtd45-4.5
 	>= dev-libs/libcgroup-0.41
-	>= dev-libs/libxslt-1.1.26
-	>= dev-lang/vala-0.38
-	>= dev-util/intltool-0.50
+	>= dev-libs/libxslt-1.1.32
+	>= dev-lang/vala-0.40
+	>= dev-util/intltool-0.51
 	>= dev-util/gperf-3.1
 	>= virtual/kernel-headers
 	>= dev-libs/glib2-dev-2.42
@@ -175,7 +177,7 @@
 	https://github.com/${PNAME}/${PNAME}/archive/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	mirror://udev/${UDEV_CONFIG_SRCFILE}
-	mirror://${PNAME}/${PNAME}-235-magellan-configurable-getty-2.patch
+	mirror://${PNAME}/${PNAME}-239-magellan-configurable-getty-2.patch
 	mirror://${PNAME}/${PNAME}-234-getty-busybox-compat.patch
 	mirror://${PNAME}/${PNAME}-236-uucp-group.patch
 	mirror://${PNAME}/${PNAME}-233-systemd-user-pam.patch
@@ -209,7 +211,8 @@
 	DESCRIPTION="A Userspace Implementation for dynamic /dev nodes."
 	DEPEND="${UDEV_DEPEND}
 		== sys-fs/libudev-${PVER}
-		== sys-libs/libsystemd-shared-${PVER}"
+		== sys-libs/libsystemd-shared-${PVER}
+		== sys-apps/systemd-systemctl-${PVER}"
 	PCAT="sys-fs"
 }
 
@@ -248,6 +251,13 @@
 	PCAT="sys-libs"
 }
 
+split_info_systemd-systemctl()
+{
+	DESCRIPTION="systemd services control utility."
+	DEPEND="${SYSTEMCTL_DEPEND}
+		== sys-libs/libsystemd-shared-${PVER}"
+}
+
 split_info_systemd-coredump()
 {
 	DESCRIPTION="systemd coredump utility."
@@ -262,6 +272,7 @@
 		== sys-libs/libsystemd-${PVER}
 		== sys-libs/libsystemd-shared-${PVER}
 		== net-dns/nss-myhostname-${PVER}
+		== sys-apps/systemd-systemctl-${PVER}
 		== sys-fs/udev-${PVER}"
 	# ignore with alx
 	# == sys-apps/systemd-coredump-${PVER}
@@ -322,7 +333,7 @@
 fi
 
 	# magellan-only: use a configurable getty
-	mpatch ${PNAME}-235-magellan-configurable-getty-2.patch || die
+	mpatch ${PNAME}-239-magellan-configurable-getty-2.patch || die
 
 	# fix busybox compat, agetty options unknown
 	mpatch ${PNAME}-234-getty-busybox-compat.patch || die
@@ -454,6 +465,7 @@
 	# remove files which are owned by other packages
 	mdelete /etc/systemd/coredump.conf || die
 	mdelete /usr/bin/coredumpctl || die
+	mdelete /usr/bin/systemctl || die
 	mdelete /usr/bin/systemd-analyze || die
 	mdelete /usr/bin/kernel-install || die
 	mdelete -r /etc/udev || die
@@ -481,6 +493,7 @@
 		mdelete /usr/lib/pkgconfig/libudev.pc || die
 	fi
 	mdelete /usr/share/man/man1/coredumpctl.1 || die
+	mdelete /usr/share/man/man1/systemctl.1 || die
 	mdelete /usr/share/man/man5/coredump.conf.5 || die
 	mdelete /usr/share/man/man5/coredump.conf.d.5 || die
 	mdelete /usr/share/man/man8/systemd-coredump.8 || die
@@ -578,6 +591,16 @@
 		|| die
 }
 
+src_install_systemd-systemctl()
+{
+	DESTDIR=${BINDIR} mninja install || die
+
+	zapmost ${BINDIR} \
+		usr/bin/systemctl \
+		usr/share/man/man1/systemctl.1 \
+		|| die
+}
+
 src_install_systemd-tools()
 {
 	if [[ ${ENABLE_GTK} = 1 ]]