summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-09-11 08:36:30 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-09-11 08:36:30 +0000
commit62bd473115f8e702ef82bd1c424f72e521f229e0 (patch)
tree8e999d88d01293bbbef1018217788266bd9d3ecf /x11-apps
parentdev-lang/mono: added -j1 to MAKEOPTS (bug #192059) (diff)
downloadgentoo-2-62bd473115f8e702ef82bd1c424f72e521f229e0.tar.gz
gentoo-2-62bd473115f8e702ef82bd1c424f72e521f229e0.tar.bz2
gentoo-2-62bd473115f8e702ef82bd1c424f72e521f229e0.zip
Only check for USE=X on dbus when USE=hal (Jakub Moc).
(Portage version: 2.1.3.9)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xinit/ChangeLog6
-rw-r--r--x11-apps/xinit/xinit-1.0.5-r1.ebuild10
2 files changed, 11 insertions, 5 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 016cec5305aa..effd22136631 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.100 2007/09/10 18:42:06 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.101 2007/09/11 08:36:30 dberkholz Exp $
+
+ 11 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ xinit-1.0.5-r1.ebuild:
+ Only check for USE=X on dbus when USE=hal (Jakub Moc).
*xinit-1.0.5-r1 (10 Sep 2007)
diff --git a/x11-apps/xinit/xinit-1.0.5-r1.ebuild b/x11-apps/xinit/xinit-1.0.5-r1.ebuild
index 9e0c26051b91..5d5b1df00e8b 100644
--- a/x11-apps/xinit/xinit-1.0.5-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.1 2007/09/10 18:42:06 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.2 2007/09/11 08:36:30 dberkholz Exp $
# Must be before x-modular eclass is inherited
# This is enabled due to modified Makefile.am from the patches
@@ -31,9 +31,11 @@ PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
CONFIGURE_OPTIONS="$(use_with hal consolekit)"
pkg_setup() {
- if ! built_with_use sys-apps/dbus X ; then
- eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
- die "You MUST build sys-apps/dbus with the X USE flag enabled."
+ if use hal; then
+ if ! built_with_use sys-apps/dbus X ; then
+ eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
+ die "You MUST build sys-apps/dbus with the X USE flag enabled."
+ fi
fi
}