Require working udev version. Drop the unit requiring udev which Samuli broke.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 23 insertions, 251 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 014ad5b4f8c3..7749b6454c22 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.89 2013/03/23 07:46:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.90 2013/03/24 10:30:13 mgorny Exp $
+
+  24 Mar 2013; Michał Górny <mgorny@gentoo.org> -systemd-198-r2.ebuild,
+  systemd-198-r1.ebuild:
+  Require working udev version. Drop the unit requiring udev which Samuli broke.
 
 *systemd-198-r2 (23 Mar 2013)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d24732ad9d78..42a8b85728b5 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,27 +15,26 @@ AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f3
 DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46
 DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
-EBUILD systemd-198-r1.ebuild 6840 SHA256 ee9d73058ea5d6f09c80f0f3a2e55c912e51838ef55f580f673eca2c34184487 SHA512 20dcf640ef624fdb1186f0922bc96b9cf5490fd37a6727d6714daa2205438ac84ecc771554ac5d19ff869c14e3c25adb0d96c408b1d84aa526ef1e1183e2b298 WHIRLPOOL a9fa4dddde6eedf9bf12d5693b7ad3e81d90d6924cd283b2b99d5c151618ba0772956ff4a8e86589fc0b8d87c0fd900733582dd9a304800e46fd9dfc97eeb5fe
-EBUILD systemd-198-r2.ebuild 6954 SHA256 8f9d81bc3dfdab12fdbcffc1cc888c1deb668797bdb4cf4dcd35e8b4d4a560c5 SHA512 d425164f30b01202fee091c55cc380f9c3b12a9837c7df4f773f6cc0f24a4b01c2bec740da52aa4ee0c54c89e275760c6c2f927d800b40bae1990610321f3f4d WHIRLPOOL 156070e14b10efa623f10bd8ca664ca035b6a859bea4e7120ce6c6ecdd9bad233a8a932617ef411556eaff1f13e97524b18f37979029e5104581ab340ecce9dd
+EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-9999.ebuild 7133 SHA256 6109aae146699032f9a5c809bde7e279224d5e260d9a9ae8d4f0943e7712f6de SHA512 7a46015cc35d9c680b681c34776a76ef1e6db9750ed0f4bcd81898cd5136a01088c71cc19c8d3ca0fc755887b0d9b37aff240138e8560b677d91c69ffd1887b2 WHIRLPOOL 2a1040c048360dad2f19620d39ba0eacdf84a2dcba3e8e285b636e4c7d7102d4181e37253c7f137e22f17b0ee8f9f0cded367c86091de0f7e1aa61c9fb3e1b55
-MISC ChangeLog 17669 SHA256 5435298da485897a4323aa2cc4ac17f6ef5ced5d183317cdad0b1c4635cbe077 SHA512 47f2d5a84e3e988f426c6c3033ef08bf5f58c710d37dba2893130507a6a35f09c0f2c369cec596b2f5d995e6a4711e51277d1020a103d6be9d3b9db918d15dcf WHIRLPOOL fe2eaf70191b3a1d13e8f33333ecf92bca0936bd587b67247e2ef4ef81996b4f135662ae7c63e8368c6338a2c9ab8e485670dc7c26dfc13fcb6b70dd076e1b0c
+MISC ChangeLog 17850 SHA256 d388f0dfe4f7880f6914de1f2cf78cef4eb432a07c31ce81094f91ce19f8d5e2 SHA512 cc95868d9e12cfac94803865336438a9269f6aec8436b57fbbaee6d2b241f0fa922efdb498f2bfd6b7bd09edff27fa3f2d720d02e33029b7dbb87821f5429f6e WHIRLPOOL cb2bdb8e43467792e8578c27c2165459c29d50da0c1cb01bbc580648bf60189856d4eca906b4d17604547aeb40edfa4799c2408a7c47cf3463d8c0f6488e226c
 MISC metadata.xml 870 SHA256 d10bf3958e17ce55fc757cebfb5be5b4a8f74d3948f572ae6997cdec040d4a65 SHA512 7e7740688960cb004f6bdcc200d13ff7f6a920bb0a2573499b730cb2ec7fd3493c3c839c0383e465cba9c22d7fe722b6f41205ce1b75436cf923a41d3cbdb94f WHIRLPOOL 8990c497b916df66e92deda13376eb057abc3137807bc126b80b4b217d8a65cafb1bf21de4f8030bb4cdcde69fc8632ef36f7868a93911b813a1b7de9b38a283
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRTV4mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRTtXtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD0x8P/iTbfVT1cFil4XZl+DsOeaih
-1sOk0CXuY5AlZHoP2EKPMJ7GGycyPSE1DNTDtMZiAxZzbHLmcnQbYymx+bGS+VmB
-lKN0ep5YIoHUv2n3zUZ0dfPFSBr87TU1EhOfgzUVxWz+gyTwH4fFC8N0Rn2sz7Iu
-bYG5fGJdIOoc3eMdPSBDkDNf6yuYGs0Zu2bqUMU7zeDCxYqlofeUecT8FoDf7Z56
-NAI6h4bE/aG/0LpTWuy5ue6U40yej/WdGKguQFfi1SlMckc3f36Cieqf5GOwg//J
-wpflQSvbz2zOv1GCLZcWwuueLEVfHnsodlrOWSyxQBm5OHkjbdEst8jAQcVBSBc+
-ljWy8ob3NDxdU+Nq6KujQTCFaU2C+oRrPfIBvOvm0f0HsAYPCdq4bKFxB1BlKN/c
-nXJJF69eQKoJGz9D+y9CvYHeFjQQnHSifPceMWpcnRe2FZR0MzpfCH9JUnVWNaCu
-yTBwdsGe4Q5j1BaHsZMc7cYDRpyWbgKa82rOy8fWN6pY5x1DLQZ61YfbLT3E65gQ
-+PsDZ+oXpXYVQ+W5O6lKUI0md2ztWLadacNHI7yVRbGV8xPAc+Bu1hyzAppflrT6
-zKvbguoJ/hfntNZlYC5I8C90pW8/+BazTTGo+BmVX3/E3A6wOl9C5mp0ZEQVwOEa
-Q7ddWbfIKUhX5hNkoNV/
-=fcs3
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD6XoP/2Z7N8N2p5Hb2ZwsKbfBttV2
+sDeO3qtS28nvmaVAgH4S7OhEJYZyetiCRbJvdaVVGHSlgeobYW4293HJ+WFge+T7
+eeYya5NBCvegrG9CEZLIfXvzCrVBYbs3g56E+gebm3SwzxPS3b2kdhRTA6onwvNu
+Xx88sv+dbMkh5YOrLyVVq7TxYklCwZbGw/3yZwWdyTIDPWnraiqFP6fD6wTj4roC
+twkb26Jr2Xhs6hYb0hkcGw8x+RInoN5qAY7sb0dq7Z7ZB163LVnbDk2zvz075Tpp
+7BGMIq7XVM0oNkS+xSpIAByC6eOp57JbPHsnfyQDnaBNfr/Mdl9g78ghTj4GaAoE
+pZGE4RwpTkC7xX4rJKnqsx0gB5JC59L2Sk4DKG8yhdePbwrzNfFx8MPCXu4hV94s
++ubnam1RUU0c5nH5yw9Rqx56uCT5PN3V92bHQ/Bd2tbtYV84Nr79yinfAXSI1CrO
+smWx+k/VJbgbKvAVdiFV3dqPZDKAEUn5l/6lyAHrDbOZjt+DlrciTbYca8FPTXg7
+fHfKSmJadilxDCwHZJAy5OT4RmP2SeFWLS7X8nFfhrabvIMs0zuU4UPF/IRKY599
+yi+MslL5BTtbf1no5zfInQr8sQ74EzSUuYBXbfYPU6k2p9HskP6UW+0Zvc3fczSA
+8EsLv6GAcmMwh81r+3I1
+=N7FR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-198-r1.ebuild b/sys-apps/systemd/systemd-198-r1.ebuild
index a6a3d66f2ada..ec3c64d4b203 100644
--- a/sys-apps/systemd/systemd-198-r1.ebuild
+++ b/sys-apps/systemd/systemd-198-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r1.ebuild,v 1.1 2013/03/14 09:25:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r1.ebuild,v 1.2 2013/03/24 10:30:13 mgorny Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ MINKV="2.6.39"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 	>=sys-apps/util-linux-2.20
+	<sys-fs/udev-${PV}-r5[acl?]
 	~sys-fs/udev-${PV}[acl?]
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
diff --git a/sys-apps/systemd/systemd-198-r2.ebuild b/sys-apps/systemd/systemd-198-r2.ebuild
deleted file mode 100644
index d1dc1e8e315d..000000000000
--- a/sys-apps/systemd/systemd-198-r2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r2.ebuild,v 1.1 2013/03/23 07:46:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils linux-info multilib pam python-single-r1 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 ~ppc64 ~x86"
-IUSE="acl audit cryptsetup efi gcrypt http +kmod lzma pam python
-	qrcode selinux tcpd vanilla xattr"
-
-MINKV="2.6.39"
-
-COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
-	>=sys-apps/util-linux-2.20
-	~sys-fs/udev-${PV}[acl?]
-	!<sys-fs/udev-198-r4
-	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 )
-	kmod? ( >=sys-apps/kmod-12 )
-	lzma? ( app-arch/xz-utils )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	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-auth/nss-myhostname
-	!<sys-libs/glibc-2.10
-	!<sys-fs/udev-197-r3"
-
-# 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}"
-
-# eautomake will likely trigger a full autoreconf
-DEPEND+=" dev-libs/gobject-introspection
-	>=dev-libs/libgcrypt-1.4.5
-	>=dev-util/gtk-doc-1.18"
-
-src_prepare() {
-	# link against external udev.
-	sed -i -e 's:lib\(udev\)\.la:-l\1:' Makefile.am
-
-	local PATCHES=(
-		"${FILESDIR}"/198-0001-Disable-udev-targets.patch
-		"${FILESDIR}"/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch
-		"${FILESDIR}"/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch
-	)
-
-	autotools-utils_src_prepare
-
-	# XXX: support it within eclass
-	eautomake
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		# 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
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# udev parts
-		--disable-introspection
-		--disable-gtk-doc
-		--disable-gudev
-		# just text files
-		--enable-polkit
-		# optional components/dependencies
-		$(use_enable acl)
-		$(use_enable audit)
-		$(use_enable cryptsetup libcryptsetup)
-		$(use_enable efi)
-		$(use_enable gcrypt)
-		$(use_enable http microhttpd)
-		$(use_enable kmod)
-		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_with python)
-		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
-		$(use_enable qrcode qrencode)
-		$(use_enable selinux)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable xattr)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install \
-		udevlibexecdir=/lib/udev
-
-	# Moved to udev
-	rm "${D}$(systemd_get_unitdir)/initrd-udevadm-cleanup-db.service" || die
-
-	# zsh completion
-	insinto /usr/share/zsh/site-functions
-	newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
-
-	# remove pam.d plugin .la-file
-	prune_libtool_files --modules
-
-	# move nss_myhostname to rootfs (bug #460640)
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \
-		|| die "Unable to move nss_myhostname to rootfs"
-
-	# 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
-
-	# 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
-
-	# Disable storing coredumps in journald, bug #433457
-	mv "${D}"/usr/lib/sysctl.d/coredump.conf \
-		"${D}"/etc/sysctl.d/coredump.conf.disabled || die
-
-	# 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() {
-	enewgroup systemd-journal
-	if use http; then
-		enewgroup systemd-journal-gateway
-		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
-	fi
-	systemd_update_catalog
-
-	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 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."
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}