[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, sys-apps/accountsservice/files/, sys-apps/accountsservice/

[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, sys-apps/accountsservice/files/, sys-apps/accountsservice/

[Nirbheek Chauhan]

commit:     1a66f03d2eb38a77201af07cf0e23e854db89530
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue May 24 03:26:50 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 15:45:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a66f03d

gnome-base/gdm-3.0.2 and sys-apps/accountsservice-0.6.12 bump

* gdm-3.0.2 now requires >=accountsservice-0.6.12
* Our accountsservice patches have been merged upstream

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 .../gdm/{gdm-3.0.0-r1.ebuild => gdm-3.0.2.ebuild}  |    2 +-
 ...6.6-r3.ebuild => accountsservice-0.6.12.ebuild} |   10 -------
 .../accountsservice-fix-nameless-users-crash.patch |   29 --------------------
 .../files/accountsservice-fix-useradd.patch        |   23 ---------------
 4 files changed, 1 insertions(+), 63 deletions(-)

diff --git a/gnome-base/gdm/gdm-3.0.0-r1.ebuild b/gnome-base/gdm/gdm-3.0.2.ebuild
similarity index 99%
rename from gnome-base/gdm/gdm-3.0.0-r1.ebuild
rename to gnome-base/gdm/gdm-3.0.2.ebuild
index 70cbe3e..00d4cc6 100644
--- a/gnome-base/gdm/gdm-3.0.0-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.0.2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	>=gnome-base/gconf-2.31.3
 	>=x11-misc/xdg-utils-1.0.2-r3
 	>=sys-power/upower-0.9
-	>=sys-apps/accountsservice-0.6.5
+	>=sys-apps/accountsservice-0.6.12
 
 	app-text/iso-codes
 

diff --git a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild
similarity index 80%
rename from sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild
rename to sys-apps/accountsservice/accountsservice-0.6.12.ebuild
index dfa66af..3f2b469 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild
@@ -44,13 +44,3 @@ pkg_setup() {
 		$(use_enable introspection)"
 	DOCS="AUTHORS NEWS README TODO"
 }
-
-src_prepare() {
-	# Taken from upstream trunk, remove for next release
-	epatch "${FILESDIR}/${PN}-fix-useradd.patch"
-
-	# Taken from upstream trunk, remove for next release
-	epatch "${FILESDIR}/${PN}-fix-nameless-users-crash.patch"
-
-	gnome2_src_prepare
-}

diff --git a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch b/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch
deleted file mode 100644
index 28e3f02..0000000
--- a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74c01ff9e3a3b00810ae69db2f2d089b68c5220a Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 15 Apr 2011 16:24:51 +0000
-Subject: Don't crash when removing nameless users
-
-Every person had in the beginning one only proper name, except the savages
-of Mount Atlas in Barbary, which were reported to be both nameless and
-dreamless.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=35872
----
-diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
-index 4e25bf9..7202b07 100644
---- a/src/libaccountsservice/act-user-manager.c
-+++ b/src/libaccountsservice/act-user-manager.c
-@@ -732,7 +732,10 @@ remove_user (ActUserManager *manager,
-         if (act_user_get_object_path (user) != NULL) {
-                 g_hash_table_remove (manager->priv->users_by_object_path, act_user_get_object_path (user));
-         }
--        g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user));
-+        if (act_user_get_user_name (user) != NULL) {
-+                g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user));
-+
-+        }
- 
-         if (manager->priv->is_loaded) {
-                 g_signal_emit (manager, signals[USER_REMOVED], 0, user);
---
-cgit v0.8.3-6-g21f6

diff --git a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch b/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch
deleted file mode 100644
index 7022125..0000000
--- a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f30ba8c977d35c2c74b61c3ae14c492e28e02175 Mon Sep 17 00:00:00 2001
-From: Frédéric Péters <fpeters@0d.be>
-Date: Fri, 18 Mar 2011 13:16:34 +0000
-Subject: daemon: fix call to useradd for normal users
-
----
-diff --git a/src/daemon.c b/src/daemon.c
-index 32e9c97..755ada5 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -1111,8 +1111,8 @@ daemon_create_user_authorized_cb (Daemon                *daemon,
-                 argv[7] = NULL;
-         }
-         else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {
--                argv[6] = cd->user_name;
--                argv[7] = NULL;
-+                argv[4] = cd->user_name;
-+                argv[5] = NULL;
-         }
-         else {
-                 throw_error (context, ERROR_FAILED, "Don't know how to add user of type %d", cd->account_type);
---
-cgit v0.8.3-6-g21f6