Allow use of upower in place of devicekit-power. Clean up old revisions.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

6 files changed, 16 insertions, 506 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 1cc209ac0703..8e69aa3fbc81 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -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.
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a0893031d516..21b5dc5ebf42 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -10,26 +10,22 @@ AUX gdm-2.20.10-gdmsetup-24hr-combo.patch 1108 RMD160 4d4cc4731d07363dbe0d52c08f
 AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 RMD160 cc84a57a53e0f8ab8688173f96869c6563054b98 SHA1 d15d3187df74570831b6b4a9c125ff9ee218fd72 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1
 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
 AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9ab3c9a33 SHA1 1718004f16455a3f3c957b40b2391c563988681e SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d
-AUX gdm-2.26.1-libxklavier4.patch 1842 RMD160 cae9308944ff4118bd06e411b11e1df6b97fdf99 SHA1 0fbb97f83b980c9bfaab1e95108d9462640c9134 SHA256 7978417318e80628939cdbf62d59ba56cb15242748cb89b5a8b6c02b5265173a
 AUX gdm-2.28.2-remove-hal.patch 6934 RMD160 94083bac8b9b489d47414330cd06601c32a3901c SHA1 0a254daba5dd8c9ee91d362ee64d185c521bf8fa SHA256 a8303f2834132c88c6cd6925dd96a10877c7a180c761246ac701f1dd09de5d7d
 DIST gdm-2.20.10.tar.bz2 3940077 RMD160 4bb50375d30638143b47b7884405e9999e304da5 SHA1 42e9e52184393352f005f1735843a30f764aef18 SHA256 5d4a2e5973a778871c9bfb91d76580747a4ef40771fd4368169a5868bb2db127
 DIST gdm-2.20.11.tar.bz2 4013059 RMD160 e400bb8a0b78a2e8b0da98edd2e0f3a7a0267f04 SHA1 be23bdf32b7a4254ac80983f4edf25cafa847ff3 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
 DIST gdm-2.26-gentoo-patches.tar.bz2 4175 RMD160 356cd339b733e41c504bf2c951a322da205439be SHA1 a58adde0bb70b56d4b61cd5bf0ca81fbbfa44c69 SHA256 e6ad1a4995eb622cf74e5e897ac0588dff122446af5e1e52f165fd8bccb105d2
-DIST gdm-2.26.1.tar.bz2 2526832 RMD160 abba568b616d5837f6aeedf3d2759a349df66c9e SHA1 7c0b665c1235b903b58e5bfff8678e435529ff6c SHA256 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
 DIST gdm-2.28.2.tar.bz2 2283246 RMD160 9b5cd1fb0a9799e783546331ac117aebc3ee7474 SHA1 c5b3fb7908aeb341a1bf8fc28b4afb601626e601 SHA256 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.20.10-r2.ebuild 6710 RMD160 7f08bb62189800150e4e978a7afe794296ec6a91 SHA1 e80b6ed58d27f02910b7c035debbc66fb5ec7248 SHA256 3fa9a2823e4a2a02d390c4838d48f7acc3fcfbb7f47c7c09673fdf4afeeb371d
-EBUILD gdm-2.20.10-r3.ebuild 6892 RMD160 5b2638364f6e100435632cfd3997601666b1b119 SHA1 29dbd3ba39abf99df7b4471e9467e64526d72af7 SHA256 5759beeaa1ec7d76e5a01ac48966aff181e80680587e1d47cd9518b3cc9224d4
 EBUILD gdm-2.20.11.ebuild 7049 RMD160 5a3f2aec7fabb74b2969d58e1cb110f9bedc8f50 SHA1 3172c4413a42f310785dd4554138ba36e0a648d4 SHA256 ea114fe7ba9a64e0094b4f5d9c7b2bef102a402df30c6eb75ae4b13b70bbb62c
-EBUILD gdm-2.26.1.ebuild 5756 RMD160 106b1bf721b869f6111a616d6359b2f8aaf5bc31 SHA1 5b098d18cd7f38318f329ff6668110df6656860b SHA256 09884474ea22b35e5199a4ca041ae48812bdf7dff96080600d4825031d695f5e
-EBUILD gdm-2.28.2-r1.ebuild 5925 RMD160 25c2b99d8dbd93f9cb2fdd700c49213cbaf61fcf SHA1 f303081f42793fe430c3a0bfae64f51f5c26bb1b SHA256 1f1c2b0df69d96f2ac813c17fa3eea8723604df8bc7f04c03a62f490de0a30f1
-MISC ChangeLog 44619 RMD160 35f2d8753d27d4a8365f852f282dee78ec4861df SHA1 fd3c4f7fd94e62716609d530b908dcde8261756c SHA256 21c20a6b11b6e714f18f7cc24f5efdd4ef565b82dfa2edafc4d9817bb71407de
+EBUILD gdm-2.28.2-r1.ebuild 5951 RMD160 2783ced9653785f82193dc0be2cef368bab0ecd1 SHA1 be6aae4a3e56862afb849b885300c8a80be1766c SHA256 25e0ed81f883280edad3ae13a60cfff613740461a3ed5dfeef48194f1b6adc66
+MISC ChangeLog 44854 RMD160 8fdf6cc4a36f736783996eea2b0e783cecd2d3dc SHA1 9ad4543766f9e08a9f3bc625b4684bf37356d29e SHA256 62e27c50cd227d8d4dc1826e556a88f07ebf5689ca30ab79a969a2a808ff432b
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzdAACgkQcsIHjyDViGRZ1wCfTFsplQhN/mdKY0Saph1ndvrG
-x48AnjXY0Y69hQTVIULOC8CzxDn/fh8M
-=EHCh
+iEYEARECAAYFAkyksiUACgkQ1fmVwcYIWAYiPQCfchfuI+upYY8WVWlnaqgCrUMw
+u3UAn3nv9++LDlhD0CEZgwIEHQmlMj8L
+=99Pw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch
deleted file mode 100644
index 6f665b7660cc..000000000000
--- a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 21 Jul 2009 00:56:37 +0200
-Subject: [PATCH] Add support for libxklavier-4
-
----
- configure.ac                     |   10 +++++++---
- gui/simple-greeter/gdm-layouts.c |    4 ++++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4a44d5..068e45c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier],
- have_libxklavier=no
- if test "x$enable_libxklavier" = "xyes"; then
-    PKG_CHECK_MODULES(LIBXKLAVIER,
--	  libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
--          have_libxklavier=yes,
--          have_libxklavier=no)
-+	  libxklavier >= 4,
-+	  [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support])
-+	   have_libxklavier=yes],
-+	  [PKG_CHECK_MODULES(LIBXKLAVIER,
-+		libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
-+		have_libxklavier=yes,
-+		have_libxklavier=no)])
-    if test "x$have_libxklavier" = "xyes" ; then
-       AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-    fi
-diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
-index dc35094..97e1e08 100644
---- a/gui/simple-greeter/gdm-layouts.c
-+++ b/gui/simple-greeter/gdm-layouts.c
-@@ -52,7 +52,11 @@ init_xkl (void)
-                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
-                 xkl_engine_backup_names_prop (engine);
-                 config_registry = xkl_config_registry_get_instance (engine);
-+#if HAVE_XKL_4
-+                xkl_config_registry_load (config_registry, FALSE);
-+#else
-                 xkl_config_registry_load (config_registry);
-+#endif
- 
-                 initial_config = xkl_config_rec_new ();
-                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
--- 
-1.6.3.3
-
diff --git a/gnome-base/gdm/gdm-2.20.10-r3.ebuild b/gnome-base/gdm/gdm-2.20.10-r3.ebuild
deleted file mode 100644
index c7a73697714c..000000000000
--- a/gnome-base/gdm/gdm-2.20.10-r3.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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.20.10-r3.ebuild,v 1.3 2010/07/20 15:33:19 jer Exp $
-
-EAPI="2"
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3"
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-PDEPEND="pam? ( >=sys-auth/pambase-20090430[consolekit=,gnome-keyring=] )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_enable accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
-
-	# Make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
-
-	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
-	# does not contain any relevant data and autologin enabled, bug #281442
-	epatch "${FILESDIR}/${P}-desktop-session-dmrc-autologin.patch"
-
-	# Fix 24 hour combo box in gdmsetup, bug #301151
-	# patch imported from ubuntu mirrors
-	epatch "${FILESDIR}/${P}-gdmsetup-24hr-combo.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 failed"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay" || die "dobin failed"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Use Clearlooks as default theme, bug #268496
-	dosed "s:#GtkTheme=Default:GtkTheme=Clearlooks:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [ "$(rc-config list default | grep xdm)" != "" ] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-2.26.1.ebuild b/gnome-base/gdm/gdm-2.26.1.ebuild
deleted file mode 100644
index 6232215fd01e..000000000000
--- a/gnome-base/gdm/gdm-2.26.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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.26.1.ebuild,v 1.7 2010/05/22 16:20:59 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils pam gnome2 autotools
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility +consolekit debug ipv6 gnome-keyring policykit selinux tcpd test xinerama +xklavier $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/gtk+-2.10.0
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/gnome-session-2.26
-	xklavier? ( >=x11-libs/libxklavier-3.5 )
-	x11-libs/libXft
-	app-text/iso-codes
-
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	virtual/pam
-	consolekit? (
-		sys-auth/consolekit
-		>=sys-apps/hal-0.5.12_rc1-r1[consolekit] )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	policykit? (
-		>=sys-auth/policykit-0.8
-		>=gnome-extra/policykit-gnome-0.8 )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-
-	!gnome-extra/fast-user-switch-applet"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=/etc
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_with accessibility xevie)
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_enable policykit polkit)
-		$(use_with consolekit console-kit)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"
-
-	# Make it daemonize so that the boot process can continue (#236701)
-	epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch"
-
-	# Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
-	epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"
-
-	# Make custom session work, bug #.
-	epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d
-	epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"
-
-	# Fix libxklavier automagic support
-	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
-
-	# Fix libxklavier-4 support
-	epatch "${FILESDIR}/${PN}-2.26.1-libxklavier4.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-	dopamd "${gentoodir}"/pam.d/*
-	dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-2.28.2-r1.ebuild b/gnome-base/gdm/gdm-2.28.2-r1.ebuild
index 5d16c615c1b1..a97114dc14e9 100644
--- a/gnome-base/gdm/gdm-2.28.2-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.28.2-r1.ebuild
@@ -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 @@ SRC_URI="${SRC_URI}
 
 # 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 @@ RDEPEND=">=sys-apps/devicekit-power-008
 	>=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