sys-apps/systemd: Bump to v29, update 9999 ebuild

4 files changed, 46 insertions, 262 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 77c14ae..8554b39 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,4 @@
-DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3
-DIST systemd-28.tar.bz2 810357 RMD160 0d91101b158af98cbd7d9be35f5a9dae51d565fc SHA1 8c8e04f4577afcc7fa5f28205d581594fe69367b SHA256 dd11cc85b2f2afc8094cefb47af519d5a03a9ec1abce0fb82bc19d48fa471b33
-EBUILD systemd-26.ebuild 4327 RMD160 d26de8d5b632a0c96b2dc19441d0d0d57bbfa2da SHA1 188fa736286c9bbc48147b732512243ed0e9a60d SHA256 0499bf01d2e23cf5106139597d0d2eec54625463da808285f9562dc7a6c735e1
-EBUILD systemd-28.ebuild 3346 RMD160 73d7a20821cecf752cc5c4281846175fe4bec6cc SHA1 c1a8b0084aa2686ef607c8152445fd1bad5866bf SHA256 c98c077cf207cefd6f3d1c7b999244c58b979927fd59ee7bfcc65ab28ee0fe43
-EBUILD systemd-9999.ebuild 4405 RMD160 2c5a3056bcb324e699cf91335e269accfd09e084 SHA1 93faa0d5fc75516ee410df92de2dc4ee8c994384 SHA256 fa1281797ded87f02d624580ed83d7ff4054929b37331950dd963fa3d699d85c
+DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
+EBUILD systemd-29.ebuild 3346 RMD160 73d7a20821cecf752cc5c4281846175fe4bec6cc SHA1 c1a8b0084aa2686ef607c8152445fd1bad5866bf SHA256 c98c077cf207cefd6f3d1c7b999244c58b979927fd59ee7bfcc65ab28ee0fe43
+EBUILD systemd-9999.ebuild 3348 RMD160 eb103148994d510375b78ffa20e595cbf3530867 SHA1 d3e55ed27a87fd29f55e6f465da4b1adf19ea769 SHA256 d23609d91684f802d1a4acfe5e2b20b12f63908b69e0fa1659dfb142619f7274
 MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d
diff --git a/sys-apps/systemd/systemd-26.ebuild b/sys-apps/systemd/systemd-26.ebuild
deleted file mode 100644
index 7f7ee69..0000000
--- a/sys-apps/systemd/systemd-26.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam plymouth selinux sysv +tcpwrap"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7 )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	>=sys-apps/util-linux-2.19
-	plymouth? ( >=sys-boot/plymouth-0.8.4 )"
-
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-MINKV="2.6.38"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/systemd-units"
-DEPEND="${COMMON_DEPEND}
-	gtk? ( dev-lang/vala:${VALASLOT} )
-	>=sys-kernel/linux-headers-${MINKV}"
-
-check_no_uevent_hotplug_helper() {
-	local path
-	if linux_config_exists; then
-		path="$(linux_chkconfig_string UEVENT_HELPER_PATH)"
-		path="${path#\"}"
-		path="${path%\"}"
-		path="${path#\'}"
-		path="${path%\'}"
-		if test "${path}" != ""; then
-			qewarn "The kernel should be configured with"
-			qewarn "CONFIG_UEVENT_HELPER_PATH=\"\". Also, be sure to check"
-			qewarn "that /proc/sys/kernel/hotplug is empty."
-		fi
-	fi
-}
-
-pkg_pretend() {
-	local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-	linux-info_pkg_setup
-	check_no_uevent_hotplug_helper
-	kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
-}
-
-pkg_setup() {
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force the rebuild of .vala sources
-	touch src/*.vala
-}
-
-src_configure() {
-	local myconf="
-		--with-distro=gentoo
-		--with-rootdir=
-		--localstatedir=/var
-		$(use_enable audit)
-		$(use_enable gtk)
-		$(use_enable pam)
-		$(use_enable selinux)
-		$(use_enable tcpwrap)
-	"
-
-	if use sysv; then
-		myconf="
-			${myconf}
-			--with-sysvinit-path=/etc/init.d
-			--with-sysvrcd-path=/etc
-		"
-	else
-		myconf="
-			${myconf}
-			--with-sysvinit-path=
-			--with-sysvrcd-path=
-		"
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-${VALASLOT})"
-	fi
-
-	use plymouth && export have_plymouth=1
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}"/usr/share/doc/systemd/* &&
-		rm -r "${D}"/usr/share/doc/systemd
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8 || die
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	if ! "${ROOT}"bin/systemd-machine-id-setup; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-check_var_run_is_symlink() {
-	if test ! -L "${ROOT}"var/run; then
-		einfo "${ROOT}var/run should be a symlink to ${ROOT}run. This is not"
-		einfo "trivial to change, and there is no hurry as it is currently"
-		einfo "bind-mounted at boot-time. You may be able to create the"
-		einfo "symlink by lazily unmounting ${ROOT}var/run first."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-	systemd_machine_id_setup
-	check_var_run_is_symlink
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-
-	ewarn "This is a work-in-progress ebuild. You may brick your system. Have fun!"
-}
diff --git a/sys-apps/systemd/systemd-28.ebuild b/sys-apps/systemd/systemd-29.ebuild
index 2559f65..2559f65 100644
--- a/sys-apps/systemd/systemd-28.ebuild
+++ b/sys-apps/systemd/systemd-29.ebuild
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index ea1ee61..758f2a3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 inherit autotools eutils git linux-info pam
 
-DESCRIPTION="systemd is a system and service manager for Linux"
+DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 EGIT_REPO_URI="git://anongit.freedesktop.org/systemd"
 EGIT_BRANCH="master"
@@ -14,53 +14,42 @@ EGIT_BRANCH="master"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam plymouth selinux +tcpwrap"
+IUSE="audit cryptsetup gtk pam plymouth selinux tcpd"
 
-COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	|| ( >=sys-fs/udev-171 >=sys-fs/udev-163[systemd] )
+	>=sys-apps/util-linux-2.19
 	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
+	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( sys-fs/cryptsetup )
 	gtk? (
 		dev-libs/dbus-glib
 		>=dev-libs/glib-2.26
 		x11-libs/gtk+:2
 		>=x11-libs/libnotify-0.7 )
 	pam? ( virtual/pam )
+	plymouth? ( sys-boot/plymouth )
 	selinux? ( sys-libs/libselinux )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	>=sys-apps/util-linux-2.19
-	plymouth? ( >=sys-boot/plymouth-0.8.4 )"
+	tcpd? ( sys-apps/tcp-wrappers )"
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
 VALASLOT="0.12"
+# A little higher than upstream requires
+# but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
 
 RDEPEND="${COMMON_DEPEND}
-	sys-apps/systemd-units"
+	sys-apps/systemd-units
+	!!sys-apps/systemd-dbus
+	!!sys-apps/systemd-udev
+	!<sys-apps/openrc-0.8.3"
 DEPEND="${COMMON_DEPEND}
 	gtk? ( dev-lang/vala:${VALASLOT} )
 	>=sys-kernel/linux-headers-${MINKV}"
 
-check_no_uevent_hotplug_helper() {
-	local path
-	if linux_config_exists; then
-		path="$(linux_chkconfig_string UEVENT_HELPER_PATH)"
-		path="${path#\"}"
-		path="${path%\"}"
-		path="${path#\'}"
-		path="${path%\'}"
-		if test "${path}" != ""; then
-			qewarn "The kernel should be configured with"
-			qewarn "CONFIG_UEVENT_HELPER_PATH=\"\". Also, be sure to check"
-			qewarn "that /proc/sys/kernel/hotplug is empty."
-		fi
-	fi
-}
-
 pkg_pretend() {
 	local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
 	linux-info_pkg_setup
-	check_no_uevent_hotplug_helper
 	kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
 }
 
@@ -72,34 +61,38 @@ pkg_setup() {
 src_prepare() {
 	# Apply patches from /etc/portage/patches/sys-apps/systemd/
 	epatch_user
-
 	eautoreconf
 }
 
 src_configure() {
-	local myconf="
+	local myeconfargs=(
 		--with-distro=gentoo
 		--with-rootdir=
 		--localstatedir=/var
 		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable gtk)
 		$(use_enable pam)
 		$(use_enable selinux)
-		$(use_enable tcpwrap)
-	"
+		$(use_enable tcpd tcpwrap)
 
-	use gtk && export VALAC="$(type -p valac-${VALASLOT})"
+		# right now it is enabled on per-distro basis
+		# let's just hack into the check
+		$(use plymouth && echo have_plymouth=true)
+	)
 
-	use plymouth && export have_plymouth=1
+	if use gtk; then
+		export VALAC="$(type -p valac-${VALASLOT})"
+	fi
 
-	econf ${myconf}
+	econf "${myeconfargs}"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc "${D}"/usr/share/doc/systemd/*
-	rm -rf "${D}"/usr/share/doc/systemd
+	rm -rf "${D}"/usr/share/doc/systemd || die
 
 	cd "${D}"/usr/share/man/man8/
 	for i in halt poweroff reboot runlevel shutdown telinit; do
@@ -109,63 +102,24 @@ src_install() {
 	keepdir /run
 }
 
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-		elog
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	if ! "${ROOT}"bin/systemd-machine-id-setup; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-		elog
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-		elog
-	else
-		einfo
-	fi
-}
-
-check_var_run_is_symlink() {
-	if test ! -L "${ROOT}"var/run; then
-		elog "${ROOT}var/run should be a symlink to ${ROOT}run. This is not"
-		elog "trivial to change, and there is no hurry as it is currently"
-		elog "bind-mounted at boot-time. You may be able to create the"
-		elog "symlink by lazily unmounting ${ROOT}var/run first."
-		elog
-	fi
-}
-
-check_var_lock_is_symlink() {
-	if test ! -L "${ROOT}"var/lock; then
-		elog "${ROOT}var/lock should be a symlink to ${ROOT}run/lock, see"
-		elog "  https://lwn.net/Articles/436012/"
-		elog
+pkg_postinst() {
+	if [[ ! -L "${ROOT}"etc/mtab ]]; then
+		ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
+		ewarn "require that specific feature, please call:"
+		ewarn "	$ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
 	fi
-}
 
-pkg_postinst() {
-	check_mtab_is_symlink
-	systemd_machine_id_setup
-	check_var_run_is_symlink
-	check_var_lock_is_symlink
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
+	elog "You may need to perform some additional configuration for some programs"
+	elog "to work, see the systemd manpages for loading modules and handling tmpfiles:"
+	elog "	$ man modules-load.d"
+	elog "	$ man tmpfiles.d"
 	elog
 
-	ewarn "This is a work-in-progress ebuild. You may brick your system. Have fun!"
+	ewarn "Please note this is a work-in-progress and many packages in Gentoo"
+	ewarn "do not supply systemd unit files yet. You are testing it on your own"
+	ewarn "responsibility. Please remember than you can pass:"
+	ewarn "	init=/sbin/init"
+	ewarn "to your kernel to boot using sysvinit / OpenRC."
 }