systemd: update to 36, added native conf files.

srcpkgs/systemd-analyze

@@ -0,0 +1 @@
+systemd

srcpkgs/systemd/INSTALL

@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	[ ! -f etc/machine-id ] && bin/systemd-machine-id-setup
+	;;
+esac

srcpkgs/systemd/files/hostname

@@ -0,0 +1 @@
+void-live

srcpkgs/systemd/files/locale.conf

@@ -0,0 +1,2 @@
+LANG=es_ES.UTF-8
+LC_COLLATE=C

srcpkgs/systemd/files/os-release

@@ -1,4 +1,4 @@
-NAME=Vanilla
+NAME=Void
-ID=vanilla
+ID=void
-PRETTY_NAME=Vanilla GNU/Linux
+PRETTY_NAME=Void Linux
 ANSI_COLOR=1;34

srcpkgs/systemd/files/vconsole.conf

@@ -1,3 +1,17 @@
-KEYMAP=us
+# systemd virtual console configuration file for Void GNU/Linux.
+#
+# To choose your system keymap.
+# All keymaps are available in /lib/kbd/keymaps.
+KEYMAP=es
+
+# To choose your system font.
+# All fonts are available in /lib/kbd/consolefonts.
 FONT=lat9w-16
-FONT_MAP=8859-1_to_uni
+
+# To choose your system charset map.
+# All charset maps are available in /lib/kbd/consoletrans.
+FONT_MAP=latin2u
+
+# To choose your system unicode map.
+# All unicode maps are available in /lib/kbd/unimaps.
+FONT_UNIMAP=lat9w

srcpkgs/systemd/systemd-admin.template

@@ -12,8 +12,6 @@ Add_dependency run systemd
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
+	vmove usr/bin/systemadm usr/bin
-	mv ${SRCPKGDESTDIR}/usr/bin/systemadm ${DESTDIR}/usr/bin
+	vmove "usr/share/man/man1/systemadm*" usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/systemadm* \
-		${DESTDIR}/usr/share/man/man1
 }

srcpkgs/systemd/systemd-analyze.template

@@ -0,0 +1,16 @@
+# Template file for 'systemd-analyze'.
+#
+short_desc="${sourcepkg} - systemd analyze"
+long_desc="${long_desc}
+
+ This package contains systemd-analyze, a python application to analyze
+ systemd."
+
+Add_dependency run python
+Add_dependency run dbus-python
+Add_dependency run systemd
+
+do_install()
+{
+	vmove usr/bin/systemd-analyze usr/bin
+}

srcpkgs/systemd/systemd-devel.template

@@ -9,8 +9,8 @@ noarch=yes
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	vmove usr/share/man/man3 usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+	vmove usr/share/doc usr/share
 }

srcpkgs/systemd/systemd-gnome-passwd-agent.template

@@ -14,8 +14,6 @@ Add_dependency run systemd
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
+	vmove "usr/bin/systemd-gnome*" usr/bin
-	mv ${SRCPKGDESTDIR}/usr/bin/systemd-gnome* ${DESTDIR}/usr/bin
+	vmove "usr/share/man/man1/systemd-ask-*" usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/systemd-ask-* \
-		${DESTDIR}/usr/share/man/man1
 }

srcpkgs/systemd/template

@@ -1,16 +1,16 @@
 # Template file for 'systemd'
 pkgname=systemd
-version=29
+version=36
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--with-distro=gentoo --with-rootdir= --localstatedir=/var
+configure_args="--with-distro=other --with-rootdir= --localstatedir=/var
---with-pamlibdir=/lib/security --disable-selinux
+--with-pamlibdir=/lib/security --disable-selinux --disable-tcpwrap
---with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc/init.d"
+--with-sysvinit-path= --with-sysvrcd-path= --disable-audit"
 short_desc="systemd is a system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
 license="GPL-2"
-checksum=c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
+checksum=693cd0a8ad63c5e22c0fc45115e05180f0d33f60118972c0d5d080957fc69774
 long_desc="
  systemd is a system and service manager for Linux, compatible with SysV and LSB
  init scripts. systemd provides aggressive parallelization capabilities, uses 
@@ -20,28 +20,43 @@ long_desc="
  implements an elaborate transactional dependency-based service control logic. 
  It can work as a drop-in replacement for sysvinit."
 
+subpackages="systemd-admin systemd-analyze systemd-gnome-passwd-agent systemd-devel"
+
+keep_empty_dirs=yes
 system_groups="lock"
-subpackages="systemd-admin systemd-gnome-passwd-agent systemd-devel"
+conf_files="
-conf_files="/etc/systemd/system.conf"
+/etc/hostname
+/etc/vconsole.conf
+/etc/locale.conf
+/etc/systemd/system.conf
+/etc/systemd/user.conf
+/etc/systemd/systemd-logind.conf
+/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+/etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+/etc/dbus-1/system.d/org.freedesktop.login1.conf
+/etc/dbus-1/system.d/org.freedesktop.locale1.conf
+/etc/dbus-1/system.d/org.freedesktop.timedate1.conf"
 
 Add_dependency run glibc
 Add_dependency run libudev
-Add_dependency run tcp_wrappers-libs
 Add_dependency run pam
 Add_dependency run libcap
 Add_dependency run dbus-libs
 Add_dependency run dbus
+Add_dependency run acl
 
-Add_dependency build m4
 Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gperf
+Add_dependency build libxslt
+Add_dependency build acl-devel
 Add_dependency build libudev-devel
 Add_dependency build pam-devel
 Add_dependency build dbus-devel
 Add_dependency build libcap-devel
-Add_dependency build tcp_wrappers-devel
-Add_dependency build glib-devel
 Add_dependency build gtk+-devel
 Add_dependency build libnotify-devel
+Add_dependency build vala-devel
 
 pre_configure()
 {
@@ -49,18 +64,14 @@ pre_configure()
 	sed -i -e "s|/usr/bin/setfont|/sbin/setfont|g" Makefile.in
 }
 
-pre_install()
-{
-	install -d ${DESTDIR}
-	ln -sf /lib ${DESTDIR}/lib64
-}
-
 post_install()
 {
-	rm -f ${DESTDIR}/lib64
 	cd ${DESTDIR}/usr/share/man/man8
 	for manpage in telinit halt reboot poweroff runlevel shutdown; do
 		mv ${manpage}.8 ${manpage}-systemd.8
 	done
-	mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib
+	vinstall ${FILESDIR}/hostname 644 etc
+	vinstall ${FILESDIR}/vconsole.conf 644 etc
+	vinstall ${FILESDIR}/os-release 640 etc
+	vinstall ${FILESDIR}/locale.conf 644 etc
 }

xbps-src/common/mapping_shlib_binpkg.txt

@@ -864,3 +864,5 @@ libtracker-extract-0.12.so.0	libtracker		tracker-devel
 libtracker-miner-0.12.so.0	libtracker		tracker-devel
 libtracker-sparql-0.12.so.0	libtracker		tracker-devel
 libmex-0.2.so.0			mex
+libsystemd-daemon.so.0		systemd
+libsystemd-login.so.0		systemd