Version bump. Still masked due to udev dep.

Package-Manager: portage-2.2.0_alpha59_p8/cvs/Linux x86_64

4 files changed, 19 insertions, 155 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 86015d45ada3..c7dd0320f7c7 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2011/09/05 21:34:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.13 2011/09/25 17:16:00 mgorny Exp $
+
+*systemd-36 (25 Sep 2011)
+
+  25 Sep 2011; Michał Górny <mgorny@gentoo.org> -systemd-32.ebuild,
+  -systemd-35.ebuild, +systemd-36.ebuild:
+  Version bump. Still masked due to udev dep.
 
 *systemd-35 (05 Sep 2011)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 21820e865fa7..01f265342c36 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,19 +2,17 @@
 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
+DIST systemd-36.tar.bz2 921952 RMD160 f2d7051239886a09ec689138e4bc027ba3676795 SHA1 ebe4a0eb5c2e17e43418a6657d15470cb84d2f25 SHA256 693cd0a8ad63c5e22c0fc45115e05180f0d33f60118972c0d5d080957fc69774
 EBUILD systemd-29-r2.ebuild 3961 RMD160 0ba293786fb5f858a7a71b659e3578096e2eb0d0 SHA1 252470adb7969a30775f9d7668c661dab2acd28c SHA256 9f8a9288729135dd2def93aebd2ae096cd183b64f4ccc27f363be6fd254f302b
-EBUILD systemd-32.ebuild 3959 RMD160 5abf4decd308168ea9817752be50a66bc8a67dd0 SHA1 e9be97c8f1eb69902668bb3f13b4bbba3525b514 SHA256 f03de84a31a7c09637f3982349bb6cc34dce7ec1b6ee1750a53cf044442ab3f5
-EBUILD systemd-35.ebuild 3959 RMD160 8eecd9a52cb10822240b759dee7920e9a5426825 SHA1 87403cc9e75a34c614c83e781e3c7490ae58a1c7 SHA256 90feba44856b34a7126874a810ab323dd058b928f07b17ba9ceeaa8a05100457
-MISC ChangeLog 2211 RMD160 a160b8026fe924fc0eab227c59e675038f7a6545 SHA1 20a6a23c5c63e966cf3ed2aaaeacff2fafde3c71 SHA256 12d536fe7996b69b27029d8ad6cbbcb9f62e6b3154213273eabf9434363dd363
+EBUILD systemd-36.ebuild 3964 RMD160 7b915d866dd0120a9d9e81aa79d6a12aaeec9b67 SHA1 feffff6b36a033870c9c6f2984ea60126b875a10 SHA256 fe3c83ab409b1adc5d1912846463a6863d533f11f94743147411d3ce92e182e1
+MISC ChangeLog 2397 RMD160 bdde141b2ca8d23c2e6045290a97dec72be5998f SHA1 d13d93c5b397a6079b545bbe7f6ddbdbd5ce8f9e SHA256 f05400cca672d40415a2694537ecbc50598e3de016bc7322c7bfb67d6188e3d0
 MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sbwACgkQfXuS5UK5QB3euQQAj7ccvUlpMgY7aO6Lq0MPpjGa
-QySIBqPe7J7yAs4IWr64VS2BZhH9Fyyt2oTI52ZNNsdR4lEcAqRU009HfYCrFx+l
-904xYe7RU+9jj4+ViRwohLWBxY+++adAzeX/UzFL6DLebUWRH0tbxpYMTken931c
-tOyX3CdFM8Ima/IMQ/I=
-=U+Ns
+iJwEAQEIAAYFAk5/YmkACgkQfXuS5UK5QB29mwQAhqPNt8oNc2moki7UmJuRrhHB
+OXaydv+unRAAH6Y48fIjFNztlR3rQT+HaO9OjaDalmGxUO6CjAmJT+NOMiI+iTbX
+La8+xuVoF8JnV3Ff2GBOMa6v75IEKBY+gW+WS6F7oygrPYoV7JQOuMXQWwr/IEh8
+Mxgz7p+duluIWdNCVNw=
+=etEr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-32.ebuild b/sys-apps/systemd/systemd-32.ebuild
deleted file mode 100644
index 1cf05d775080..000000000000
--- a/sys-apps/systemd/systemd-32.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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-32.ebuild,v 1.1 2011/08/09 11:36:42 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.14"
-# 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."
-}
diff --git a/sys-apps/systemd/systemd-35.ebuild b/sys-apps/systemd/systemd-36.ebuild
index cf3c599a454b..8b415d41ca40 100644
--- a/sys-apps/systemd/systemd-35.ebuild
+++ b/sys-apps/systemd/systemd-36.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-36.ebuild,v 1.1 2011/09/25 17:16:00 mgorny Exp $
 
 EAPI=4
 
-inherit autotools-utils bash-completion linux-info pam systemd
+inherit autotools-utils bash-completion-r1 linux-info pam systemd
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -64,7 +64,7 @@ src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
 		--with-rootdir=
-		--with-rootlibdir=$(get_libdir)
+		--with-rootlibdir=/$(get_libdir)
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable acl)
@@ -89,7 +89,7 @@ src_install() {
 		bashcompletiondir=/tmp
 
 	# move files as necessary
-	dobashcompletion "${D}"/tmp/systemctl-bash-completion.sh
+	newbashcomp "${D}"/tmp/systemctl-bash-completion.sh ${PN}
 	dodoc "${D}"/tmp/docs/*
 	rm -rf "${D}"/tmp || die