From b36fb21dee4dc797cf8c2b970850258b6a1e8f79 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 5 Sep 2011 21:34:24 +0000
Subject: [PATCH] Version bump. Still masked due to udev not bumped.

Package-Manager: portage-2.2.0_alpha51_p82/cvs/Linux x86_64
---
 sys-apps/systemd/ChangeLog         |   7 +-
 sys-apps/systemd/Manifest          |  14 +--
 sys-apps/systemd/systemd-35.ebuild | 140 +++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 7 deletions(-)
 create mode 100644 sys-apps/systemd/systemd-35.ebuild

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 64bf2cb06b5c..86015d45ada3 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.11 2011/08/15 07:48:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.12 2011/09/05 21:34:24 mgorny Exp $
+
+*systemd-35 (05 Sep 2011)
+
+  05 Sep 2011; Michał Górny <mgorny@gentoo.org> +systemd-35.ebuild:
+  Version bump. Still masked due to udev not bumped.
 
 *systemd-29-r2 (15 Aug 2011)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index cbfc5b6df39a..8badddb3d10b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
 DIST systemd-32.tar.bz2 877943 RMD160 361681c014ba89b7f2e388f463ea60ac00cb8eed SHA1 062725079ad189ffedab831e6fa4f6e8aa48f307 SHA256 714bd00ceb44639a675e8a7b7ee4f6bff42b70a442110c70e64ff41056828dae
+DIST systemd-35.tar.bz2 891535 RMD160 ee05610fd09edf07fee50f5e6b80033f69b9beeb SHA1 271fe8c98eea6c5e3dee3f18c967f5958e89ec66 SHA256 fc449019b7c8fc52d21aaf2234693db18ef485cb8921736724b1ab3eb278afdd
 EBUILD systemd-29-r2.ebuild 3961 RMD160 0ba293786fb5f858a7a71b659e3578096e2eb0d0 SHA1 252470adb7969a30775f9d7668c661dab2acd28c SHA256 9f8a9288729135dd2def93aebd2ae096cd183b64f4ccc27f363be6fd254f302b
 EBUILD systemd-32.ebuild 3959 RMD160 5abf4decd308168ea9817752be50a66bc8a67dd0 SHA1 e9be97c8f1eb69902668bb3f13b4bbba3525b514 SHA256 f03de84a31a7c09637f3982349bb6cc34dce7ec1b6ee1750a53cf044442ab3f5
-MISC ChangeLog 2060 RMD160 496f4b5a63a87dc43fc359b582f18d319891c2de SHA1 62acaec44ba1de2ab058d0d2e949b770407ce530 SHA256 9a1f8467c0b4b9bb85f14729ace5eebdcc271af005594faba7886c0e9c4fc47f
+EBUILD systemd-35.ebuild 3959 RMD160 8eecd9a52cb10822240b759dee7920e9a5426825 SHA1 87403cc9e75a34c614c83e781e3c7490ae58a1c7 SHA256 90feba44856b34a7126874a810ab323dd058b928f07b17ba9ceeaa8a05100457
+MISC ChangeLog 2211 RMD160 a160b8026fe924fc0eab227c59e675038f7a6545 SHA1 20a6a23c5c63e966cf3ed2aaaeacff2fafde3c71 SHA256 12d536fe7996b69b27029d8ad6cbbcb9f62e6b3154213273eabf9434363dd363
 MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5Iz7AACgkQfXuS5UK5QB3Y9QP7BQSd7ipxsD7/WF0Ubzo8QBJa
-J0FRsFUkvGe8OjvIZYTUJQc7XXRrePp5tSU5HOUIGfs/MHMumv+bZ+WqmD2UitwD
-5/Ix7TgzOhu088mmDZph6UGeSCt9SVhverYSICyjf4Xl0wbgaEh3AE3P+S6UzLIK
-kujlo+D/dJbneEsLquI=
-=mXNZ
+iJwEAQEIAAYFAk5lQOAACgkQfXuS5UK5QB2mNgP/XYrWXSpfF2uPqo0CJ8jNHgJF
+AYU3ukGiLJIKuQkRRjMt0lUy8uegkvswUNM65hE6oIYGgir1lnwxfmNWxOQQC1ya
+Dt9hOTpKybjig0u1y798LUmmZSjDeojHYq+fFWgeX0hAOt/LSsBk2KuQlFKeM9q5
+2DmRYU/orfVIoGdnHsU=
+=H6zy
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-35.ebuild b/sys-apps/systemd/systemd-35.ebuild
new file mode 100644
index 000000000000..cf3c599a454b
--- /dev/null
+++ b/sys-apps/systemd/systemd-35.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-35.ebuild,v 1.1 2011/09/05 21:34:24 mgorny Exp $
+
+EAPI=4
+
+inherit autotools-utils bash-completion linux-info pam systemd
+
+DESCRIPTION="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=""
+IUSE="acl audit cryptsetup gtk pam plymouth selinux tcpd"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	>=sys-apps/util-linux-2.19
+	>=sys-fs/udev-172
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	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 )
+	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"
+
+# dbus, udev versions because of systemd units
+# blocker on old packages to avoid collisions with above
+# openrc blocker to avoid udev rules starting openrc scripts
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/openrc-0.8.3"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	dev-util/intltool
+	gtk? ( dev-lang/vala:${VALASLOT} )
+	>=sys-kernel/linux-headers-${MINKV}"
+
+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 || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-distro=gentoo
+		--with-rootdir=
+		--with-rootlibdir=$(get_libdir)
+		--localstatedir=/var
+		--docdir=/tmp/docs
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gtk)
+		$(use_enable pam)
+		$(use_enable plymouth)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+	)
+
+	if use gtk; then
+		export VALAC="$(type -p valac-${VALASLOT})"
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install \
+		bashcompletiondir=/tmp
+
+	# move files as necessary
+	dobashcompletion "${D}"/tmp/systemctl-bash-completion.sh
+	dodoc "${D}"/tmp/docs/*
+	rm -rf "${D}"/tmp || die
+
+	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
+}
+
+pkg_preinst() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6"
+	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+	check_extra_config
+}
+
+optfeature() {
+	elog "	[$(has_version ${1} && echo I || echo ' ')] ${1} (${2})"
+}
+
+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
+
+	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
+
+	elog "To get additional features, a number of optional runtime dependencies may"
+	elog "be installed:"
+	optfeature 'dev-python/dbus-python' 'for systemd-analyze'
+	optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability'
+	elog
+
+	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."
+}
-- 
2.26.2