Restore UI parts in the ebuild.

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

3 files changed, 41 insertions, 16 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index e648aa92275c..9df1ff689f93 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
 # 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.24 2012/03/05 08:50:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.25 2012/03/08 18:13:14 mgorny Exp $
+
+  08 Mar 2012; Michał Górny <mgorny@gentoo.org> systemd-43.ebuild:
+  Restore UI parts in the ebuild.
 
   05 Mar 2012; Michał Górny <mgorny@gentoo.org> -systemd-37-r1.ebuild,
   -systemd-37-r4.ebuild, -systemd-38-r1.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fbd087997a3e..75f62eac9d67 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,15 +11,15 @@ DIST systemd-43.tar.xz 852432 RMD160 8eeea1454b0cdfc202755979e34656ae3a4d99eb SH
 EBUILD systemd-29-r3.ebuild 4168 RMD160 ec3b586586dd8851959a1578c3b3381bc7614c22 SHA1 bd90e1d39ac64f64f50d52d0c10363672e4f3d8a SHA256 f57c09fa9a7e161d3e889deee7fc024187c9904fc049029bcadaa0d03f07c8df
 EBUILD systemd-29-r6.ebuild 5343 RMD160 df19c4926cfa9952188a0687027fc6f774b6030b SHA1 357c2b02f2fe969af8f8efd2fa763d770dd9283b SHA256 43dfe5c7d1be9e3460fcf22c6521966eb8e2e80d98152623d34a5e58757602c0
 EBUILD systemd-39.ebuild 5454 RMD160 a4b0ce372ea7e780e1c1b1c931833ede401dbce5 SHA1 6e0248ba0a506a30a25dce15c5bb499fa531a072 SHA256 9335d903a460530ddd7c0f63374cf26adacf0ed3f586159b0c431e25f622fee3
-EBUILD systemd-43.ebuild 4935 RMD160 4c6c73ac57361eb4fb9c5468d6e8e41cb147c6ae SHA1 43f50febd62280c386c1f40227201415be0b9247 SHA256 c8ae3e5742dc4c8ee93b3a0256f036bda0cde2a0e9ec5b0cb3a28c13a06f8f5e
-MISC ChangeLog 4739 RMD160 ba3ba8307339a162a6961b135baf364bff522255 SHA1 28d1e988008b0591a3d6bd7c86fd7eb634644ac2 SHA256 53a43e9e809397e9f65a7bc87d9f8d4e739f55e83253cd7e5d9b208487b0727c
+EBUILD systemd-43.ebuild 5307 RMD160 ab05601ff2ad8dd872673b981cd4ed44e4693566 SHA1 7958e55dd692812d2e223fbe57b2e232ad7b59fb SHA256 3ff57c0c9949cc4469d688bad282dd3f7e7349ef1b977259d034262c09ffa238
+MISC ChangeLog 4843 RMD160 02b33595f8f117b33719f6974796d22c78f0a223 SHA1 d76460a7d531114de505c74c5c91e4ee45c1c88a SHA256 3de7e83875360501804bd8aed19bf2d319f4294dcd2f22ce492fec8af45eaef2
 MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk9UfuQACgkQfXuS5UK5QB154wQAk7pRTkFrtM+3tV/jb/pP5zY6
-jdg9r/nwK18I4JPv1N1y2ptCJ5Qh03ffv6jIa8BLhD6FuRWRAxvvT8py88qok3mh
-A6XGJP9hNYgVRK62LwDUS9JDULrIb1bWFagoKQqzCCxfe5FTvYsCHin8ML+wAAEX
-Qz1Syojfkl8NobU/jKM=
-=nLLz
+iJwEAQEIAAYFAk9Y91kACgkQfXuS5UK5QB0GSQP+ISAuwdCPfsR/ZNF6h1YnC8NX
+FDN5jRgV14bdpb1S8t7egstr/9GAM77sYbAF05vLSFUvEeHOc7R0YzikLlksGqNK
+h6kWuXEQWfrZJY95MOVGWKbaM8AGb8fRaGr1w2ACwmrEJiEJbsqN/fXzwOvt8vO5
+9c4M/zXYUinh3+l4gm0=
+=Q27S
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-43.ebuild b/sys-apps/systemd/systemd-43.ebuild
index 298a9a100357..2bb623de45b2 100644
--- a/sys-apps/systemd/systemd-43.ebuild
+++ b/sys-apps/systemd/systemd-43.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-43.ebuild,v 1.1 2012/02/23 16:16:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-43.ebuild,v 1.2 2012/03/08 18:13:14 mgorny Exp $
 
 EAPI=4
 
@@ -13,11 +13,10 @@ 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"
-
-# We need to depend on sysvinit for sulogin which is used in the rescue
-# mode. Bug #399615.
+IUSE="acl audit cryptsetup gtk lzma pam plymouth selinux tcpd"
 
+# Vala-0.10 doesn't work with libnotify 0.7.1
+VALASLOT="0.14"
 # A little higher than upstream requires
 # but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
@@ -33,6 +32,13 @@ RDEPEND=">=sys-apps/dbus-1.4.10
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( sys-fs/cryptsetup )
+	gtk? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26
+		dev-libs/libgee:0
+		x11-libs/gtk+:2
+		>=x11-libs/libnotify-0.7
+		!sys-apps/systemd-ui )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
 	plymouth? ( sys-boot/plymouth )
@@ -43,13 +49,27 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	dev-util/gperf
 	dev-util/intltool
+	gtk? ( dev-lang/vala:${VALASLOT} )
 	>=sys-kernel/linux-headers-${MINKV}"
 
+# Due to vala being broken.
+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() {
+	# Force the rebuild of .vala sources
+	touch src/*.vala || die
+
+	# Fix hardcoded path in .vala.
+	sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die
+
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
@@ -64,15 +84,18 @@ src_configure() {
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gtk)
 		$(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
 	)
 
+	if use gtk; then
+		export VALAC="$(type -p valac-${VALASLOT})"
+	fi
+
 	autotools-utils_src_configure
 }
 
@@ -136,7 +159,6 @@ pkg_postinst() {
 	elog "be installed:"
 	optfeature 'dev-python/dbus-python' 'for systemd-analyze'
 	optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability'
-	optfeature 'sys-apps/systemd-ui' 'for GTK+ systemadm UI and gnome-ask-password-agent'
 	elog
 
 	ewarn "Please note this is a work-in-progress and many packages in Gentoo"