Version bump. Re-enable coredumps since a tool to read them was introduced. Add USE=vanilla to disable Gentoo-specific quirks as requested by Léo Gillot-Lamure (via mail). Remove PAM .la file wrt bug #424900.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 224 insertions, 8 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 5fee8fe4f0cb..075d9ad4827b 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.56 2012/10/04 20:16:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.57 2012/10/26 21:27:16 mgorny Exp $
+
+*systemd-195 (26 Oct 2012)
+
+  26 Oct 2012; Michał Górny <mgorny@gentoo.org> +systemd-195.ebuild,
+  metadata.xml:
+  Version bump. Re-enable coredumps since a tool to read them was introduced.
+  Add USE=vanilla to disable Gentoo-specific quirks as requested by Léo Gillot-
+  Lamure (via mail). Remove PAM .la file wrt bug #424900.
 
   04 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd-194.ebuild:
   Preserve empty directories, per bug #437008.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 167f3e04e4d6..59e48392dc0b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,19 +19,21 @@ DIST systemd-191.tar.xz 1401640 SHA256 2fa0a2b4a1eb855f4e1d7f4f1a1883cd43d68dc35
 DIST systemd-192.tar.xz 1405792 SHA256 55c449554ab68c7b237e86584a69b6e60538b4853ef7b6e5317d9d3e78f0c30f SHA512 d2c6179b250b4e1a3c019199fb46a4115f850cfb6d39c8b2232bc3ff0f87b1eb662d0aa4c13a5a554fd0103a8fe52c6e538150df4abac5815516f65ade130828 WHIRLPOOL db15a1458a2d02a548a5f1b5a0e10dab2913a807396e0b734f8e4834103f77c6d6e45379d4d10263cdf3154b0c3fe4562a7fe79236f8eff120198947bddeed42
 DIST systemd-193.tar.xz 1413652 SHA256 b9db6be1fa4a9c89c088ceec39f0d24de63ab76831b12916f147841262ac0ecd SHA512 6eefb9adb62b0190298b1f3de0c6e4e91e5d58780cc563924a5445b6482ed2cf53213167e01b28695c84f385bead571c50eb5e3097c901278520de4c37fd7f0a WHIRLPOOL 3376e7a94dd75cd59c02ee8a30a7ae61367948560289c4c3f4ece384f234fab0db814802db3c330f96066a0197671c5f23b6bb1988f7235316d8cdbdc283a2e6
 DIST systemd-194.tar.xz 1409672 SHA256 a275ce044f66f28c5ed0846e7019438ce8b5f596e8255f3455e32b3c0db5f631 SHA512 af42e1a6fb10d278aa9e0b429ee7ad31587e7e55b0b261ed164b191b882317ec54274d54ec1fa70b466a69f10388db4d6ad5e21568c9cbc1112e8f39312edc5f WHIRLPOOL 99971f466fbd58de6ee17412cdd017c24a4af69a0841ea67e9ef39a6f8c3cb1c92543e99a3d67be710645f4e3bc327d5ea47e3050093557c043ac755cac15b05
+DIST systemd-195.tar.xz 1441308 SHA256 e9041a8b84ed971d08df2b96f1b7dbb1d49b788e275c7cc39912f656bd826303 SHA512 2ccd6ad065cd70aad7e666c1beba9fb31bff4dca7d54d00bfa54976e91795c1e19d5f595e88660ea3797699001613ae9204cf538fe8b0c321ba42bd7a4c402f5 WHIRLPOOL 24bd54fe3b0ddf523b9d1d30e64052ec96ac56644efce272f87d5d2cf65ec5660da404dc6c61b7ee8d66a97660fd11ce71abad0a4e7b61c6d991a07c7bfcd592
 EBUILD systemd-189-r3.ebuild 5672 SHA256 31312135e9fc3e13995250e87a2e22aeaf50f06b3fd5d95fac6d50c75cafab11 SHA512 4fca2fe58799c867b441fcd333a302873966ef3f40fc5114b54eab6aa0541038e88327da48f4174a0706a0a94dca341e3d26c2dbb4af09c38d24186dec02f9f7 WHIRLPOOL 1dcfb21fd29b2e0571c077933c036600416fb29ae1e1a833874408335be67173d27f6c9c0e70b7e2d21d44e6911a93b5a5535cee1b0d62ba8716fdf485648a19
 EBUILD systemd-191-r1.ebuild 5759 SHA256 e23491c6aae73b55cc9a9ac6dd0b876dea73f1432cfa34d19f51f6ea7a869b88 SHA512 5dfea751826e13c25796ee6de051c8ffc7b0554fc219f9c0a6d808583b87e075a87386d2d926b6ccbbaa22ac0b2b7c4aeb6eb3701dac1a112db2eda17676b5f3 WHIRLPOOL 112ef96a5c15af318adbcdf7c5dfc6888809e6cafc156f6b5ce64a7d48c54873325f41c4c3c643ed0f10252ebb37584fcae04a17889d95524281057725317c6d
 EBUILD systemd-192.ebuild 5573 SHA256 705c7cdd3f3230db8b098733e5134a9c88174264950c3b9b5029375fce10785e SHA512 73f65d6f5db3a8298f24f73960755016ba87f458f4524cbf12ee5812e9bdfdcd7b98ff36bbd319e915c689399aa7787c328b2f0a6531cae193d6a6f5d120f44e WHIRLPOOL 31c0d61b88b64d5919f6d252aa79ec6fd7528e54fa210f5620216400efc997e644cc8cfa62c2b0eafa405582c1b37c48d49764c19f417f8b13ad1a347b0781fa
 EBUILD systemd-193.ebuild 5663 SHA256 e1a8810969bd63d6de0b312fe568a1ab2ec07b74db18950c837b655207edb379 SHA512 e6744052b73426f1ac656a6e3840a92a3e3b3cdf61b539e2ed4f8a8ec37ce0cb69289fcdcaf6b09f619f1b94d8a995d5797e1d35f8bfc58d52a59b5fe97abcbc WHIRLPOOL 1a581ee2057ba3be0f0089ef9a9a07cbaa0112b0ffcedf58a03b2ab06f99686931214bcaeb119fb6542281bb3871a9ac003997a2fd4c77ee0b3137809a851be1
 EBUILD systemd-194.ebuild 5989 SHA256 888f67c18afbeaebdbebb6662ef3d43fa6da746acdf8351c9f96f964a8bcb648 SHA512 d99775ad37286724b22e592d13bb5c7a761849179385948998f4707800e0cb2b19af97f08966d15820a816bdcc9322db81cb362da8fc20ada031272b99763ac3 WHIRLPOOL 5997688801935fa86f6f9b4df4f72216984ddb14aa917c200cf5e31f26ee648acc008976f4654fe5f192b5b539adf6a3ccae46e9b86e2931a973b281f5ed15c7
-MISC ChangeLog 11090 SHA256 135002b05685ddb21b1fbf33a16edb28ede2b812fe637d7384a7c9d4bf776951 SHA512 b72dbfd3614229212923fd348453fef0c223dfcd4b9e8312b4720c81f22729ab22296162874dbdc0fe2998b43ee04ebcb8c73fa3c0a39331884d6ea98159e0a5 WHIRLPOOL 6844b2179a552ca4f49926e725b22614444855c58091eb3e5500039477acf2e5bba2a643a035f0bf21b012f3ee1fcb859d0b712f00dc894d39b8fd8915036876
-MISC metadata.xml 633 SHA256 9acea27628db4a63d88fbcd8a1d331bdd8104feae9b46104c6e58288dca34022 SHA512 ea41a507e495db375f3cc32a16e0b014e04a584683911c11305188faf7a84080252ed255a8b59a153ab578e92152811e8b02c007db5ecca9fbaa19836238bc83 WHIRLPOOL 124b7de00e170e82af4fdde8969bad9c1884ea0bd3cbcaa9b715c2495bc1206cc0b906f103fe847a6597840c9ecc77e91a2abc0ec75eac85d13eec184b453489
+EBUILD systemd-195.ebuild 6042 SHA256 76db90275d460a32dad6f64e00ea3305a21c906f02e0fcbe9734d0a4271c5eb5 SHA512 c52a2861a3ca3a8f6ab5116ec8ab7587c9dfd65eaf909370e32a3146696ac27a730094c85fd938ce8b33bf0fd44f0f51253c699fb02d533c197eb9123ee7c713 WHIRLPOOL 6483432c11a0815e6faefde9bd26276f8e343421c446e2aac3ab2f0c049a1c2cf6ef1281e39b39d0611739c47cf4c65fe22e707c74013487d2b3837f66444d7c
+MISC ChangeLog 11423 SHA256 eece024dedbbed012890933d29fe70fbb32fbb4a5cdb0559f9ad371d548a4740 SHA512 d48c9cd5d585882cf8ad4788f040e20ef0bead826eb2417e9c89080f4d9a2715e11a672aac25967fdb26f799418561b8b6fd89e392a734ffe4555215f73e1011 WHIRLPOOL 74e17acd36781b1f1364f53b9bcd7d93dd10510b648a3e45373c16dc4c72452d70a3a80df4ca10ffba405702938a45f50214ded01d366cf961c0d7080ccb7d29
+MISC metadata.xml 721 SHA256 ac3cd3bc95546a82eabab664a3bc962f616b0185a4a368d2481a9bfc768be767 SHA512 9f75d64c7647c8be41bc1f8cfc8b7fbb025f337929d72fa295e274ca2f1ca98edc5b6f4373e81b585a56b12c2f9fdd14966a5d0c4982c6eeb908a6240348eaf4 WHIRLPOOL 5651a5ebba32164a7122cf3e5203da178e2965464c6b052c62020d41597f8bd03b3622fac761b458e7418642f83753ea3b0cc0426742a21917902b48439da4db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlBt7qcACgkQfXuS5UK5QB3FzAP/QUIch2nKZMYt/zd7HaMsNpcl
-BonPnqUeZBNFKIoIcr5PAsDWD6tBYwOR05GK/QUXGewfv1YSRoFqq/upehyxR2lZ
-tSfQ3PtSwcsCGwFN7873FUhLHBfeA+/pwI2S6lwwyy4W7kIvnzT5X8Rj4h/1508p
-GHkQZwn3l6TyMN0nyCk=
-=/3lt
+iJwEAQEIAAYFAlCLAGsACgkQfXuS5UK5QB1esAP9Eh4y54QMg47uO/bHMzrb6Z5j
+UtCEBAHopLWzgvzFp1VgbKyZmb9D0eQS8KhuOSyASF1o1tsrmmzl9mMKgy0q0pgh
+2b+b2C4WL5KJLQUUNL7FaE32R1FO4EtAhjCFbV5hxKWJMqlzfih0Bf5UbBa8e9IO
+njKetoHmiuXFzinBDXQ=
+=MuDn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 3bc9e11ed324..f6f552ad3b15 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
 		<flag name='http'>Enable embedded HTTP server in journald</flag>
 		<flag name='qrcode'>Enable qrcode output support in journal</flag>
+		<flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/systemd/systemd-195.ebuild b/sys-apps/systemd/systemd-195.ebuild
new file mode 100644
index 000000000000..6a4b88e0fd8c
--- /dev/null
+++ b/sys-apps/systemd/systemd-195.ebuild
@@ -0,0 +1,205 @@
+# 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-195.ebuild,v 1.1 2012/10/26 21:27:16 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 http lzma pam qrcode selinux tcpd
+	vanilla xattr"
+
+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-194
+	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 )
+	http? ( net-libs/libmicrohttpd )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )"
+
+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/udev-187"
+
+# 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=$(use vanilla && echo other || echo 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
+		# disable python for now
+		--without-python
+		# 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 http microhttpd)
+		$(use_enable lzma xz)
+		$(use_enable pam)
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable xattr)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install \
+		bashcompletiondir=/tmp
+
+	# remove pam.d plugin .la-file
+	prune_libtool_files --modules
+
+	# 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
+
+	if ! use vanilla; then
+		# 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
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
+	# 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."
+}