Version bump. Integrate some code from the udev ebuild.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 43 insertions, 38 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 2d7eb7225e5e..f48406fdd387 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2012/06/22 14:23:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.34 2012/07/09 21:27:13 mgorny Exp $
+
+*systemd-186 (09 Jul 2012)
+
+  09 Jul 2012; Michał Górny <mgorny@gentoo.org> +files/40-gentoo.rules,
+  +systemd-186.ebuild, -systemd-185.ebuild:
+  Version bump. Integrate some code from the udev ebuild.
 
   22 Jun 2012; Michał Górny <mgorny@gentoo.org> systemd-185.ebuild:
   Disable out-of-source build wrt bug #422927.
diff --git a/sys-apps/systemd/files/40-gentoo.rules b/sys-apps/systemd/files/40-gentoo.rules
new file mode 100644
index 000000000000..fa99ba9fe5e6
--- /dev/null
+++ b/sys-apps/systemd/files/40-gentoo.rules
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+# setting permissions
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+
+# dialout devices
+KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
+
+# sound devices (oss)
+SUBSYSTEM=="snd",	GROUP="audio"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",	MODE="0666"
+
diff --git a/sys-apps/systemd/systemd-185.ebuild b/sys-apps/systemd/systemd-186.ebuild
index 503619f4f2d8..fc0ebea19f0b 100644
--- a/sys-apps/systemd/systemd-185.ebuild
+++ b/sys-apps/systemd/systemd-186.ebuild
@@ -1,6 +1,6 @@
 # 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-185.ebuild,v 1.2 2012/06/22 14:23:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-186.ebuild,v 1.1 2012/07/09 21:27:13 mgorny Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ 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"
+LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd"
@@ -18,18 +18,10 @@ IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd"
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
 
-# A little higher than upstream requires
-# but I had real trouble with 2.6.37 and systemd.
-MINKV="2.6.38"
+MINKV="2.6.39"
 
-# dbus version because of systemd units
-# sysvinit for sulogin
-RDEPEND="!sys-fs/udev
-	>=sys-apps/dbus-1.4.10
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
-	sys-apps/pciutils
-	sys-apps/sysvinit
-	sys-apps/usbutils
 	>=sys-apps/util-linux-2.20
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
@@ -42,7 +34,14 @@ RDEPEND="!sys-fs/udev
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
-DEPEND="${RDEPEND}
+# sysvinit for sulogin
+# udev is bundled
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwids
+	sys-apps/sysvinit
+	!sys-fs/udev
+	!<sys-libs/glibc-2.10"
+DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
@@ -62,6 +61,10 @@ src_prepare() {
 	# systemd-analyze is for python2.7 only nowadays.
 	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
 
+	# change rules back to group uucp instead of dialout for now
+	sed -e '/GROUP=/s:dialout:uucp:' \
+		-i rules/*.rules || die
+
 	autotools-utils_src_prepare
 }
 
@@ -73,6 +76,9 @@ src_configure() {
 		--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
 		--localstatedir=/var
 		# make sure we get /bin:/sbin in $PATH
 		--enable-split-usr
@@ -86,8 +92,6 @@ src_configure() {
 		$(use_enable pam)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
-		# plymouth is already removed in git and not keyworded on ~arm
-		--disable-plymouth
 	)
 
 	autotools-utils_src_configure
@@ -116,11 +120,9 @@ src_install() {
 	insinto /usr/lib/tmpfiles.d
 	doins "${FILESDIR}"/gentoo-run.conf
 
-	# Migration helpers.
-	exeinto /usr/libexec/systemd
-	doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh
-	systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path}
-	systemd_enable_service sysinit.target update-etc-systemd-symlinks.path
+	# Gentoo rules for udev.
+	insinto /usr/lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
 }
 
 pkg_preinst() {
@@ -155,12 +157,6 @@ pkg_postinst() {
 		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 'for systemd-analyze' \
@@ -176,15 +172,4 @@ pkg_postinst() {
 	ewarn "responsibility. Please remember than you can pass:"
 	ewarn "	init=/sbin/init"
 	ewarn "to your kernel to boot using sysvinit / OpenRC."
-
-	# Don't run it if we're outta /
-	if [[ ! ${ROOT%/} ]]; then
-		# Update symlinks to moved units.
-		sh "${FILESDIR}"/update-etc-systemd-symlinks.sh
-
-		# Try to start migration unit.
-		ebegin "Trying to start migration helper path monitoring."
-		systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null
-		eend ${?}
-	fi
 }