Only check for USE=X on dbus when USE=hal (Jakub Moc).

Package-Manager: portage-2.1.3.9

3 files changed, 19 insertions, 13 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/Manifest b/x11-apps/xinit/Manifest
index 3457b1276c11..2295048eb8d5 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -86,18 +86,18 @@ EBUILD xinit-1.0.4.ebuild 1329 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 S
 MD5 b16a86030844afb016be3629bc5414d9 xinit-1.0.4.ebuild 1329
 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 xinit-1.0.4.ebuild 1329
 SHA256 660abed7cdf4a5e8cc8d5b7ce696e4c5c4252ac23417f6acb323edbe157612c9 xinit-1.0.4.ebuild 1329
-EBUILD xinit-1.0.5-r1.ebuild 1671 RMD160 165dbf2aeb996a08ce52c7240986c611fcd51f9b SHA1 ece12da3a51d1936d2f0ca79b67006143c25cbf7 SHA256 2dd6e967ec36e8b5412081a1a223d19a013f409c02832b699cf1f38e95b9228a
-MD5 78845db1c3a820c2b50cbd09e3129951 xinit-1.0.5-r1.ebuild 1671
-RMD160 165dbf2aeb996a08ce52c7240986c611fcd51f9b xinit-1.0.5-r1.ebuild 1671
-SHA256 2dd6e967ec36e8b5412081a1a223d19a013f409c02832b699cf1f38e95b9228a xinit-1.0.5-r1.ebuild 1671
+EBUILD xinit-1.0.5-r1.ebuild 1701 RMD160 881c2cec0d38b038ecbe20239e04b1e81625a2f1 SHA1 4ee6dcd32421604c0e56a379abbea83bf9446faa SHA256 ea2993b89345907af2c03ab203eda721a8c1784d724f9e02a15f1d01768b8b61
+MD5 e44204d3be44873a2a5bb29e0cbec414 xinit-1.0.5-r1.ebuild 1701
+RMD160 881c2cec0d38b038ecbe20239e04b1e81625a2f1 xinit-1.0.5-r1.ebuild 1701
+SHA256 ea2993b89345907af2c03ab203eda721a8c1784d724f9e02a15f1d01768b8b61 xinit-1.0.5-r1.ebuild 1701
 EBUILD xinit-1.0.5.ebuild 1347 RMD160 ec4facab355f21cc0024ceb8fcf8a3f6eb9fe93a SHA1 9d7231f4af6de65fa1ac39d6edf2c00aaa944f30 SHA256 b0db843011bd8f0bdbf5ced1c1ea8f2e873949bc812fa8e1d7aa7caba93fad3b
 MD5 7a0959aa5fd5bcc8642a231d777c089f xinit-1.0.5.ebuild 1347
 RMD160 ec4facab355f21cc0024ceb8fcf8a3f6eb9fe93a xinit-1.0.5.ebuild 1347
 SHA256 b0db843011bd8f0bdbf5ced1c1ea8f2e873949bc812fa8e1d7aa7caba93fad3b xinit-1.0.5.ebuild 1347
-MISC ChangeLog 15889 RMD160 f6baad6dd26ee4a9cee15f40567cbbdee4ff6f30 SHA1 a247ea780a404e23d859307703a88e124af30f98 SHA256 9df18131f930b87caf7abea902f0c477753f25d3402baafd58fb06e90e7e57aa
-MD5 3e17d0b7c9ce98b450c02518cf2ef255 ChangeLog 15889
-RMD160 f6baad6dd26ee4a9cee15f40567cbbdee4ff6f30 ChangeLog 15889
-SHA256 9df18131f930b87caf7abea902f0c477753f25d3402baafd58fb06e90e7e57aa ChangeLog 15889
+MISC ChangeLog 16031 RMD160 7dfe697be8b28d25e8f5c9a1f2b76792616d1d7a SHA1 b741f9d0e30238bb51154b717febeaa1b7c6d629 SHA256 00243405eda79e1d3721f750fe22abf65e397d22308a7444eacd9e40fe389353
+MD5 ac74666feca21ff3cb7f127f35fbda19 ChangeLog 16031
+RMD160 7dfe697be8b28d25e8f5c9a1f2b76792616d1d7a ChangeLog 16031
+SHA256 00243405eda79e1d3721f750fe22abf65e397d22308a7444eacd9e40fe389353 ChangeLog 16031
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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
 }