Version bump.

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

3 files changed, 205 insertions, 7 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index b6fc949ea593..12d420d43952 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.52 2012/09/26 05:22:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.53 2012/09/26 06:07:06 mgorny Exp $
+
+*systemd-192 (26 Sep 2012)
+
+  26 Sep 2012; Michał Górny <mgorny@gentoo.org> +systemd-192.ebuild:
+  Version bump.
 
 *systemd-191-r1 (26 Sep 2012)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index cf23dcedb848..41bc148db4b9 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -16,16 +16,18 @@ AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa
 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
 DIST systemd-189.tar.xz 1371872 SHA256 fec0efd82c9f1bdff6cb9d9811c00830ed890dbe915e79c90ae306cdbd8c4529 SHA512 a275dc93ad68a95f6695cd4d5472d15c3a3a0439944ce54b5dc6bd14500755d769e708510877e5681b4906ef2b8eb0d67c3d77a161db717e6e9a43888c3b50af WHIRLPOOL cd3377da687f12e0a07cbf6fe74b362bbd4118905a7b2e3488170b9b0ca88238a0379df9b18e9cd506e6544311ae83cd26f493568d85b457a1a2469e06083713
 DIST systemd-191.tar.xz 1401640 SHA256 2fa0a2b4a1eb855f4e1d7f4f1a1883cd43d68dc3534d130a1095293d1bfa1d64 SHA512 9d0636df307d37f95a77368a7392d40e15a16354c838c9415af700fbd86f0da6474f5750fe2d93018984169107943be2cb87bff4b5f432afba6956ee1bd4a2bd WHIRLPOOL eea13b258cb8762a7c650333974011c6319cf3c1664363fc027c64d67199f83f597729b22a130b0c0058a6b31eafcb363baa2c66f864b3a8dc3a0175de043c26
+DIST systemd-192.tar.xz 1405792 SHA256 55c449554ab68c7b237e86584a69b6e60538b4853ef7b6e5317d9d3e78f0c30f SHA512 d2c6179b250b4e1a3c019199fb46a4115f850cfb6d39c8b2232bc3ff0f87b1eb662d0aa4c13a5a554fd0103a8fe52c6e538150df4abac5815516f65ade130828 WHIRLPOOL db15a1458a2d02a548a5f1b5a0e10dab2913a807396e0b734f8e4834103f77c6d6e45379d4d10263cdf3154b0c3fe4562a7fe79236f8eff120198947bddeed42
 EBUILD systemd-189-r3.ebuild 5672 SHA256 31312135e9fc3e13995250e87a2e22aeaf50f06b3fd5d95fac6d50c75cafab11 SHA512 4fca2fe58799c867b441fcd333a302873966ef3f40fc5114b54eab6aa0541038e88327da48f4174a0706a0a94dca341e3d26c2dbb4af09c38d24186dec02f9f7 WHIRLPOOL 1dcfb21fd29b2e0571c077933c036600416fb29ae1e1a833874408335be67173d27f6c9c0e70b7e2d21d44e6911a93b5a5535cee1b0d62ba8716fdf485648a19
 EBUILD systemd-191-r1.ebuild 5759 SHA256 e23491c6aae73b55cc9a9ac6dd0b876dea73f1432cfa34d19f51f6ea7a869b88 SHA512 5dfea751826e13c25796ee6de051c8ffc7b0554fc219f9c0a6d808583b87e075a87386d2d926b6ccbbaa22ac0b2b7c4aeb6eb3701dac1a112db2eda17676b5f3 WHIRLPOOL 112ef96a5c15af318adbcdf7c5dfc6888809e6cafc156f6b5ce64a7d48c54873325f41c4c3c643ed0f10252ebb37584fcae04a17889d95524281057725317c6d
-MISC ChangeLog 10608 SHA256 486201f4d6cff6c992fc03819f5f585386217e02b3d0f762fba37b70f2549eda SHA512 852f88926db300a8b174e336881e8f0d13935d4fee4ba4f085dbd5408d74642148740590cc24071a23ef05a473cd36fb1a4f4f40cc7233b55718f31d7c8417de WHIRLPOOL 2a7ce7b9d90f7998884e6d4097ab0502b0b1dc0101cea4fd997404e86b6e017f4abb5a591191f63187e71e501c08cdf9bf81c4556adda32d6dcb8c9904608e79
+EBUILD systemd-192.ebuild 5573 SHA256 705c7cdd3f3230db8b098733e5134a9c88174264950c3b9b5029375fce10785e SHA512 73f65d6f5db3a8298f24f73960755016ba87f458f4524cbf12ee5812e9bdfdcd7b98ff36bbd319e915c689399aa7787c328b2f0a6531cae193d6a6f5d120f44e WHIRLPOOL 31c0d61b88b64d5919f6d252aa79ec6fd7528e54fa210f5620216400efc997e644cc8cfa62c2b0eafa405582c1b37c48d49764c19f417f8b13ad1a347b0781fa
+MISC ChangeLog 10724 SHA256 ad33c8f9669e11c3f30713908e1cff2673470052a34da7791995ee677940fec0 SHA512 8569c11bad39831c7a141b7f0332d027513c0d44ffca162262387c29d4fa3d420c847e039c77a8ba121625de922ad2c91114d1807b13367dd0f53650bfee8c14 WHIRLPOOL 4d2e11e4f3a651f8977f74e7379f6810299666a89cf4141a81c9ba2a468d3b9f7d0c72e7b43224a269c69c63941cadc255e6b13fc4dd79b252788b0d0948491d
 MISC metadata.xml 566 SHA256 5b00ceccd213a57c6f1a81dd9fb026aa914aefe444bd9f60480efc2bb46a1ed7 SHA512 ea7579c1c22711253f6411cbf47333d26df384ae2a2fc1b50ad3df39332e2839aae1c3356397e5806830dda264cdb9d26f6cb54d172f840f5e518218766fe268 WHIRLPOOL a910da4dab04376307f327bd6a06e479e145eb5ba836496ec180ca7d536265d261545618103da3afb8ff1e5ef3529294d502cd81562c267355b8501aba8325a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlBikRcACgkQfXuS5UK5QB0hLAP5AVYiKFSV2kzhtf/qKhWJy945
-Cwiz2fEzJcD9Wcc1kQ0bUfDwPeP07m25XPqmn5L2SO95HqyxsZOerGSe2+y3qHlJ
-gBpH/kD8bpqO9cEOEHDRUIiS5i75o3HivNNaaOEi/eEjMIzZ48Yr23vdFbarElCb
-o1IIW5byU1RBEBSVY7I=
-=z6/D
+iJwEAQEIAAYFAlBim6QACgkQfXuS5UK5QB2ohAP+Jwp9o9xoIg5kBMTmvmKsnQM+
+OXjq+AZfDVJKm+RQFuCJF4oOj6sSMom0v7GjQ0khAFYXYHJbW6CWQzeKJAEbG2nb
+hgfyu+U65TYfaWLzzfeDSLJp9Zpbczd2NTbICVQioCEFB4fe1L8O4vo3OYQpoGqJ
+j+HfCtILlntlhoBDAEI=
+=HMY/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-192.ebuild b/sys-apps/systemd/systemd-192.ebuild
new file mode 100644
index 000000000000..8e394a687257
--- /dev/null
+++ b/sys-apps/systemd/systemd-192.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-192.ebuild,v 1.1 2012/09/26 06:07:06 mgorny Exp $
+
+EAPI=4
+
+inherit autotools-utils bash-completion-r1 linux-info pam systemd user
+
+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.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl audit cryptsetup gcrypt lzma pam qrcode selinux tcpd"
+
+MINKV="2.6.39"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+	>=sys-apps/kmod-5
+	>=sys-apps/util-linux-2.20
+	~sys-fs/udev-192
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwids
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!<sys-libs/glibc-2.10"
+
+# sys-fs/quota is necessary to store correct paths in unit files
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	dev-util/intltool
+	sys-fs/quota
+	>=sys-kernel/linux-headers-${MINKV}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	enewgroup lock # used by var-lock.mount
+	enewgroup tty 5 # used by mount-setup for /dev/pts
+}
+
+src_prepare() {
+	# systemd-analyze is for python2.7 only nowadays.
+	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
+
+	# link against external udev.
+	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
+
+	local PATCHES=(
+		"${FILESDIR}"/191-0001-Disable-udev-targets-for-udev-190.patch
+	)
+
+	autotools-utils_src_prepare
+
+	# XXX: support it within eclass
+	eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-distro=gentoo
+		# install everything to /usr
+		--with-rootprefix=/usr
+		--with-rootlibdir=/usr/$(get_libdir)
+		# but pam modules have to lie in /lib*
+		--with-pamlibdir=/$(get_libdir)/security
+		# this avoids dep on pciutils & usbutils
+		--with-pci-ids-path=/usr/share/misc/pci.ids
+		--with-usb-ids-path=/usr/share/misc/usb.ids
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# udev parts
+		--disable-introspection
+		--disable-gtk-doc
+		--disable-gudev
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gcrypt)
+		$(use_enable lzma xz)
+		$(use_enable pam)
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+
+		# Disable Python for now.
+		PYTHON=:
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install \
+		bashcompletiondir=/tmp
+
+	# compat for init= use
+	dosym ../usr/lib/systemd/systemd /bin/systemd
+	dosym ../lib/systemd/systemd /usr/bin/systemd
+	# rsyslog.service depends on it...
+	dosym ../usr/bin/systemctl /bin/systemctl
+
+	# move files as necessary
+	newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
+	rm -r "${D}"/tmp || die
+
+	# we just keep sysvinit tools, so no need for the mans
+	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		|| die
+	rm "${D}"/usr/share/man/man1/init.1 || die
+
+	# Create /run/lock as required by new baselay/OpenRC compat.
+	systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
+
+	# Add mount-rules for /var/lock and /var/run, bug #433607
+	systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
+	systemd_enable_service sysinit.target var-lock.mount
+	systemd_enable_service sysinit.target var-run.mount
+
+	# Check whether we won't break user's system.
+	[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'
+	[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.'
+}
+
+pkg_preinst() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
+		~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
+		~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+	check_extra_config
+}
+
+optfeature() {
+	local i desc=${1} text
+	shift
+
+	text="  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	shift
+
+	for i; do
+		elog "${text}"
+		text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	done
+	elog "${text} (${desc})"
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
+	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 "To get additional features, a number of optional runtime dependencies may"
+	elog "be installed:"
+	optfeature 'for systemd-analyze' \
+		'dev-lang/python:2.7' 'dev-python/dbus-python'
+	optfeature 'for systemd-analyze plotting ability' \
+		'dev-python/pycairo[svg]'
+	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
+		'sys-apps/systemd-ui'
+	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."
+}