[gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog gdm-2.28.2-r1.ebuild gdm-2.26.1.ebuild gdm-2.20.10-r3.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog gdm-2.28.2-r1.ebuild gdm-2.26.1.ebuild gdm-2.20.10-r3.ebuild

[Gilles Dartiguelongue (eva)]

eva         10/09/30 15:51:45

  Modified:             ChangeLog gdm-2.28.2-r1.ebuild
  Removed:              gdm-2.26.1.ebuild gdm-2.20.10-r3.ebuild
  Log:
  Allow use of upower in place of devicekit-power. Clean up old revisions.
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.326                gnome-base/gdm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.326&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.326&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.325&r2=1.326

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- ChangeLog	11 Sep 2010 18:47:25 -0000	1.325
+++ ChangeLog	30 Sep 2010 15:51:45 -0000	1.326
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.325 2010/09/11 18:47:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.326 2010/09/30 15:51:45 eva Exp $
+
+  30 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gdm-2.20.10-r3.ebuild, -gdm-2.26.1.ebuild,
+  -files/gdm-2.26.1-libxklavier4.patch, gdm-2.28.2-r1.ebuild:
+  Allow use of upower in place of devicekit-power. Clean up old revisions.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gdm-2.20.11.ebuild:
   Marked ppc for bug #324077.



1.5                  gnome-base/gdm/gdm-2.28.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild?r1=1.4&r2=1.5

Index: gdm-2.28.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.28.2-r1.ebuild	22 May 2010 16:20:59 -0000	1.4
+++ gdm-2.28.2-r1.ebuild	30 Sep 2010 15:51:45 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.4 2010/05/22 16:20:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.5 2010/09/30 15:51:45 eva Exp $
 
 EAPI="2"
 
@@ -25,7 +25,7 @@
 
 # FIXME: gdm has a strange behaviour on reboot (from runlevel), especially when xdm tries to stop it (its blocks).
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug 295686
-RDEPEND=">=sys-apps/devicekit-power-008
+RDEPEND="
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.15.4
 	>=x11-libs/gtk+-2.10.0
@@ -36,6 +36,9 @@
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/gnome-session-2.28
 	>=x11-misc/xdg-utils-1.0.2-r3
+	|| (
+		sys-power/upower
+		>=sys-apps/devicekit-power-008 )
 
 	app-text/iso-codes