[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/

[Michał Górny]

commit:     8fa110c383c83175443a5001fbacb9837ca4fa95
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 13:27:04 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 13:27:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=8fa110c3

sys-apps/systemd: Update for version with udev included.

(Portage version: 2.2.0_alpha110_p48/git/Linux x86_64, unsigned Manifest commit)

---
 sys-apps/systemd/metadata.xml        |    4 +++
 sys-apps/systemd/systemd-9999.ebuild |   36 ++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index aafd053..4a129bb 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,6 +9,10 @@
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
+		<flag name='doc'>Build gtk-doc API docs</flag>
+		<flag name='gudev'>Enable libudev gobject interface</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
 		<flag name='plymouth'>Enable support for <pkg>sys-boot/plymouth</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 56e0f28..de47773 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
 inherit git-2
 #endif
 
-inherit autotools-utils bash-completion-r1 linux-info pam systemd
+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"
@@ -21,7 +21,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl audit cryptsetup lzma pam plymouth selinux tcpd"
+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.
@@ -32,18 +32,21 @@ MINKV="2.6.38"
 
 # dbus version because of systemd units
 # sysvinit for sulogin
-RDEPEND=">=sys-apps/dbus-1.4.10
+RDEPEND="!sys-fs/udev
+	>=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
+	sys-apps/pciutils
 	sys-apps/sysvinit
-	>=sys-apps/util-linux-2.19
-	>=sys-fs/udev-172
+	sys-apps/usbutils
+	>=sys-apps/util-linux-2.20
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( sys-fs/cryptsetup )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
-	plymouth? ( sys-boot/plymouth )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
@@ -53,11 +56,15 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/gperf
 	dev-util/intltool
-	>=sys-kernel/linux-headers-${MINKV}"
+	>=sys-kernel/linux-headers-${MINKV}
+	doc? ( dev-util/gtk-doc )"
 
 #if LIVE
 SRC_URI=
 KEYWORDS=
+
+DEPEND="dev-libs/gobject-introspection
+	dev-util/gtk-doc"
 #endif
 
 pkg_setup() {
@@ -69,6 +76,9 @@ src_prepare() {
 	# systemd-analyze is for python2.7 only nowadays.
 	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
 
+#if LIVE /* XXX: do something about it... */
+	gtkdocize --docdir docs/ || die
+#endif
 	autotools-utils_src_prepare
 }
 
@@ -86,13 +96,13 @@ src_configure() {
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable doc gtk-doc)
+		$(use_enable gudev)
+		$(use_enable introspection)
 		$(use_enable lzma xz)
 		$(use_enable pam)
-		$(use_enable plymouth)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
-		# now in sys-apps/systemd-ui
-		--disable-gtk
 	)
 
 	autotools-utils_src_configure
@@ -135,7 +145,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6"
+	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
 }