sys-apps/systemd-9999: update ebuild with v26 ebuild

2 files changed, 55 insertions, 33 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 38b6f49..883d1b3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,4 @@
 DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3
 EBUILD systemd-26.ebuild 3676 RMD160 acd62d22657621d4dd93613a962da387b162121c SHA1 b5265f0a6bc281da5a05827a8098498ba2dc06a0 SHA256 2763a84221a9da55245766ef0b5cc1f2277a510bc4b396e7bcf43ca95da73b12
-EBUILD systemd-9999.ebuild 3077 RMD160 7d8f07f2aa567f4461c3b61eda0730c80e95e444 SHA1 93b84d98fac70f16b0f5d268426cc99c1705b5e6 SHA256 3841ecaa0200ff83d46a76e2ffb44ec8b2a4ea2e57638ebe53a720fe4d6f5d6c
+EBUILD systemd-9999.ebuild 3609 RMD160 b01d998c48ad0cb5e851cc6e4f85a876867920e4 SHA1 61b2d74cc54d7b00af725c3275fd0d4f4d070761 SHA256 52bdb7d785a54b3fcb16156ba46845cbc5806942a9972d8b90d487c1949b03a3
 MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 22c55f0..28ddd06 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -16,25 +16,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audit gtk pam +tcpwrap sysv selinux"
 
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
+COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
 	sys-libs/libcap
 	>=sys-fs/udev-163[systemd]
 	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
+	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 )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
+	tcpwrap? ( sys-apps/tcp-wrappers )
+	>=sys-apps/util-linux-2.19"
+
 VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
+MINKV="2.6.38"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/systemd-units"
+DEPEND="${COMMON_DEPEND}
+	gtk? ( dev-lang/vala:${VALASLOT} )
+	>=sys-kernel/linux-headers-${MINKV}"
 
 CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
 
@@ -49,38 +52,47 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=
+	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"
+		myconf="
+			${myconf}
+			--with-sysvinit-path=/etc/init.d
+			--with-sysvrcd-path=/etc
+		"
 	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
+		myconf="
+			${myconf}
+			--with-sysvinit-path=
+			--with-sysvrcd-path=
+		"
 	fi
 
 	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
+		export VALAC="$(type -p valac-${VALASLOT})"
 	fi
 
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
+	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/"
+	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
+		mv ${i}.8 systemd.${i}.8 || die
 	done
 
 	keepdir /run
@@ -96,8 +108,7 @@ check_mtab_is_symlink() {
 
 systemd_machine_id_setup() {
 	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
+	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
@@ -108,10 +119,19 @@ systemd_machine_id_setup() {
 	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"
@@ -119,4 +139,6 @@ pkg_postinst() {
 	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!"
 }