| 1 |
dberkholz 07/09/11 08:36:31 |
| 2 |
|
| 3 |
Modified: ChangeLog xinit-1.0.5-r1.ebuild |
| 4 |
Log: |
| 5 |
Only check for USE=X on dbus when USE=hal (Jakub Moc). |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.101 x11-apps/xinit/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.101&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.101&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.100&r2=1.101 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v |
| 18 |
retrieving revision 1.100 |
| 19 |
retrieving revision 1.101 |
| 20 |
diff -u -r1.100 -r1.101 |
| 21 |
--- ChangeLog 10 Sep 2007 18:42:06 -0000 1.100 |
| 22 |
+++ ChangeLog 11 Sep 2007 08:36:30 -0000 1.101 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for x11-apps/xinit |
| 25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.100 2007/09/10 18:42:06 steev Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.101 2007/09/11 08:36:30 dberkholz Exp $ |
| 28 |
+ |
| 29 |
+ 11 Sep 2007; Donnie Berkholz <dberkholz@g.o>; |
| 30 |
+ xinit-1.0.5-r1.ebuild: |
| 31 |
+ Only check for USE=X on dbus when USE=hal (Jakub Moc). |
| 32 |
|
| 33 |
*xinit-1.0.5-r1 (10 Sep 2007) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 x11-apps/xinit/xinit-1.0.5-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: xinit-1.0.5-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- xinit-1.0.5-r1.ebuild 10 Sep 2007 18:42:06 -0000 1.1 |
| 51 |
+++ xinit-1.0.5-r1.ebuild 11 Sep 2007 08:36:30 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2007 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
# Must be before x-modular eclass is inherited |
| 59 |
# This is enabled due to modified Makefile.am from the patches |
| 60 |
@@ -31,9 +31,11 @@ |
| 61 |
CONFIGURE_OPTIONS="$(use_with hal consolekit)" |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
- if ! built_with_use sys-apps/dbus X ; then |
| 65 |
- eerror "You MUST build sys-apps/dbus with the X USE flag enabled." |
| 66 |
- die "You MUST build sys-apps/dbus with the X USE flag enabled." |
| 67 |
+ if use hal; then |
| 68 |
+ if ! built_with_use sys-apps/dbus X ; then |
| 69 |
+ eerror "You MUST build sys-apps/dbus with the X USE flag enabled." |
| 70 |
+ die "You MUST build sys-apps/dbus with the X USE flag enabled." |
| 71 |
+ fi |
| 72 |
fi |
| 73 |
} |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
-- |
| 79 |
gentoo-commits@g.o mailing list |
Archives