From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-425808-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RwE6o-0007Jh-MJ
for garchives@archives.gentoo.org; Sat, 11 Feb 2012 14:39:27 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E88C1E07C7;
Sat, 11 Feb 2012 14:39:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id A6524E07C7
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Feb 2012 14:39:09 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E4F3D1B401E
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Feb 2012 14:39:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 479DFE5405
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Feb 2012 14:39:05 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <2d5b35cf2de9bb6fafac8dc90628c751e1b8d209.mgorny@gentoo>
Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/
X-VCS-Repository: dev/mgorny
X-VCS-Files: sys-apps/systemd/systemd-9999.ebuild
X-VCS-Directories: sys-apps/systemd/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 2d5b35cf2de9bb6fafac8dc90628c751e1b8d209
Date: Sat, 11 Feb 2012 14:39:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 7c1d7677-726b-4b4f-96c0-23bba313fa92
X-Archives-Hash: adfaed3b7ce23f098bcef8894e4f57ad
commit: 2d5b35cf2de9bb6fafac8dc90628c751e1b8d209
Author: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 14:14:56 2012 +0000
Commit: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 14:39:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D=
commit;h=3D2d5b35cf
sys-apps/systemd: The GTK+ counterpart has been moved to systemd-ui.
(Portage version: 2.2.0_alpha85_p38/git/Linux x86_64, unsigned Manifest c=
ommit)
---
sys-apps/systemd/systemd-9999.ebuild | 32 ++++------------------------=
----
1 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/syst=
emd-9999.ebuild
index 37d5e3b..6e63d4f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -21,13 +21,11 @@ SRC_URI=3D"http://www.freedesktop.org/software/system=
d/${P}.tar.xz"
LICENSE=3D"GPL-2"
SLOT=3D"0"
KEYWORDS=3D"~amd64 ~x86"
-IUSE=3D"acl audit cryptsetup gtk lzma pam plymouth selinux tcpd"
+IUSE=3D"acl audit cryptsetup lzma pam plymouth selinux tcpd"
=20
# We need to depend on sysvinit for sulogin which is used in the rescue
# mode. Bug #399615.
=20
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT=3D"0.14"
# A little higher than upstream requires
# but I had real trouble with 2.6.37 and systemd.
MINKV=3D"2.6.38"
@@ -43,12 +41,6 @@ RDEPEND=3D">=3Dsys-apps/dbus-1.4.10
acl? ( sys-apps/acl )
audit? ( >=3Dsys-process/audit-2 )
cryptsetup? ( sys-fs/cryptsetup )
- gtk? (
- dev-libs/dbus-glib
- >=3Ddev-libs/glib-2.26
- dev-libs/libgee:0
- x11-libs/gtk+:2
- >=3Dx11-libs/libnotify-0.7 )
lzma? ( app-arch/xz-utils )
pam? ( virtual/pam )
plymouth? ( sys-boot/plymouth )
@@ -59,7 +51,6 @@ DEPEND=3D"${RDEPEND}
app-arch/xz-utils
dev-util/gperf
dev-util/intltool
- gtk? ( dev-lang/vala:${VALASLOT} )
>=3Dsys-kernel/linux-headers-${MINKV}"
=20
#if LIVE
@@ -70,24 +61,11 @@ DEPEND=3D"${DEPEND}
app-text/docbook-xml-dtd:4.2"
#endif
=20
-# Due to vala being broken.
-AUTOTOOLS_IN_SOURCE_BUILD=3D1
-
pkg_setup() {
enewgroup lock # used by var-lock.mount
enewgroup tty 5 # used by mount-setup for /dev/pts
}
=20
-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=3D(
--with-distro=3Dgentoo
@@ -103,18 +81,15 @@ 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
)
=20
- if use gtk; then
- export VALAC=3D"$(type -p valac-${VALASLOT})"
- fi
-
autotools-utils_src_configure
}
=20
@@ -183,6 +158,7 @@ pkg_postinst() {
elog "be installed:"
optfeature 'dev-python/dbus-python' 'for systemd-analyze'
optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting abil=
ity'
+ optfeature 'sys-apps/systemd-ui' 'for GTK+ systemadm UI and gnome-ask-p=
assword-agent'
elog
=20
ewarn "Please note this is a work-in-progress and many packages in Gent=
oo"