Version bump (bug #450576, thanks to Agostino Sarubbo). Update license. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 114 insertions, 55 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index 707100214b17..39895ee1a1b1 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/accountsservice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.24 2013/01/06 10:07:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.25 2013/01/07 00:39:40 tetromino Exp $
+
+*accountsservice-0.6.30 (07 Jan 2013)
+
+  07 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  accountsservice-0.6.22.ebuild,
+  -files/accountsservice-0.6.24-dont-delete-root.patch,
+  -accountsservice-0.6.25.ebuild, accountsservice-0.6.29-r1.ebuild,
+  +accountsservice-0.6.30.ebuild,
+  +files/accountsservice-0.6.30-login-history-variant.patch,
+  +files/accountsservice-0.6.30-xsession-typo.patch:
+  Version bump (bug #450576, thanks to Agostino Sarubbo). Update license. Drop
+  old.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   accountsservice-0.6.29-r1.ebuild:
diff --git a/sys-apps/accountsservice/accountsservice-0.6.22.ebuild b/sys-apps/accountsservice/accountsservice-0.6.22.ebuild
index 8db7ebc2b6bc..9096334853b6 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.22.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.22.ebuild,v 1.5 2012/07/19 20:22:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.22.ebuild,v 1.6 2013/01/07 00:39:40 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ DESCRIPTION="D-Bus interfaces for querying and manipulating user account informa
 HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
 SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm x86"
 IUSE="doc +introspection vala" # systemd
diff --git a/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild
index d773c737da0c..0f1a89aeaaf9 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild,v 1.3 2013/01/06 10:07:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild,v 1.4 2013/01/07 00:39:40 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ DESCRIPTION="D-Bus interfaces for querying and manipulating user account informa
 HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
 SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +introspection systemd vala"
diff --git a/sys-apps/accountsservice/accountsservice-0.6.25.ebuild b/sys-apps/accountsservice/accountsservice-0.6.30.ebuild
index 67d7fc624be4..c25565eda771 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.25.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.30.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.25.ebuild,v 1.1 2012/09/30 09:14:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.30.ebuild,v 1.1 2013/01/07 00:39:40 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
@@ -14,9 +14,9 @@ DESCRIPTION="D-Bus interfaces for querying and manipulating user account informa
 HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
 SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +introspection systemd vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -24,11 +24,12 @@ REQUIRED_USE="vala? ( introspection )"
 RDEPEND=">=dev-libs/glib-2.30:2
 	sys-auth/polkit
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	systemd? ( >=sys-apps/systemd-43 )
+	systemd? ( >=sys-apps/systemd-186 )
 	!systemd? ( sys-auth/consolekit )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -39,22 +40,26 @@ DEPEND="${RDEPEND}
 		>=dev-lang/vala-0.16.1-r1
 		$(vala_depend) )"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-more-warnings
-		--localstatedir="${EPREFIX}"/var
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc docbook-docs)
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable systemd)
-		$(systemd_with_unitdir)"
-	DOCS="AUTHORS NEWS README TODO"
-}
-
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+
+	# Patches from 0.6.31
+	epatch "${FILESDIR}/${P}-login-history-variant.patch"
+	epatch "${FILESDIR}/${P}-xsession-typo.patch"
+
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-more-warnings \
+		--localstatedir="${EPREFIX}"/var \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable doc docbook-docs) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable systemd) \
+		$(systemd_with_unitdir)
+}
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.24-dont-delete-root.patch b/sys-apps/accountsservice/files/accountsservice-0.6.24-dont-delete-root.patch
deleted file mode 100644
index 870acdc0accf..000000000000
--- a/sys-apps/accountsservice/files/accountsservice-0.6.24-dont-delete-root.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 213aab5d984d05d09d0fbba3a76f85ed8e19a900 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Tue, 21 Aug 2012 18:54:10 -0300
-Subject: [PATCH] user-manager: Guard against NULL users
-
-If you call act_user_manager_delete_user (manager, NULL, TRUE, &error);
-you'll accidentally delete the root user. Oops.
----
- src/libaccountsservice/act-user-manager.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
-index bb09a34..1e2bf8a 100644
---- a/src/libaccountsservice/act-user-manager.c
-+++ b/src/libaccountsservice/act-user-manager.c
-@@ -2721,7 +2721,9 @@ act_user_manager_delete_user (ActUserManager  *manager,
- 
-         g_debug ("ActUserManager: Deleting user '%s' (uid %ld)", act_user_get_user_name (user), (long) act_user_get_uid (user));
- 
--        g_assert (manager->priv->accounts_proxy != NULL);
-+        g_return_val_if_fail (ACT_IS_USER_MANAGER (manager), FALSE);
-+        g_return_val_if_fail (ACT_IS_USER (user), FALSE);
-+        g_return_val_if_fail (manager->priv->accounts_proxy != NULL, FALSE);
- 
-         local_error = NULL;
-         if (!accounts_accounts_call_delete_user_sync (manager->priv->accounts_proxy,
--- 
-1.7.12
-
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.30-login-history-variant.patch b/sys-apps/accountsservice/files/accountsservice-0.6.30-login-history-variant.patch
new file mode 100644
index 000000000000..39891287b2d5
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.30-login-history-variant.patch
@@ -0,0 +1,43 @@
+From f950d51aa018c171b98602787598e6b841ab1f6c Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Tue, 18 Dec 2012 16:36:12 +0100
+Subject: [PATCH] Fix login history variant handling
+
+g_variant_compare() returns 0 when the values are equal, and non-zero
+otherwise, which is the opposite of what the check wants.
+Also, it is valid for the login history variant to be null, when the
+library is working with an older daemon. Don't emit a critical in that
+case.
+
+See: https://bugzilla.gnome.org/show_bug.cgi?id=690413
+
+https://bugs.freedesktop.org/show_bug.cgi?id=58466
+---
+ src/libaccountsservice/act-user.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c
+index 2c1fcb8..80db669 100644
+--- a/src/libaccountsservice/act-user.c
++++ b/src/libaccountsservice/act-user.c
+@@ -1120,7 +1120,7 @@ collect_props (const gchar *key,
+                 GVariant *new_login_history = value;
+ 
+                 if (user->login_history == NULL ||
+-                    !g_variant_compare (user->login_history, new_login_history)) {
++                    !g_variant_equal (user->login_history, new_login_history)) {
+                         if (user->login_history)
+                           g_variant_unref (user->login_history);
+                         user->login_history = g_variant_ref (new_login_history);
+@@ -1375,7 +1375,7 @@ _act_user_load_from_user (ActUser    *user,
+         user->login_time = user_to_copy->login_time;
+         g_object_notify (G_OBJECT (user), "login-time");
+ 
+-        user->login_history = g_variant_ref (user_to_copy->login_history);
++        user->login_history = user_to_copy->login_history ? g_variant_ref (user_to_copy->login_history) : NULL;
+         g_object_notify (G_OBJECT (user), "login-history");
+ 
+         user->account_type = user_to_copy->account_type;
+-- 
+1.8.1
+
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.30-xsession-typo.patch b/sys-apps/accountsservice/files/accountsservice-0.6.30-xsession-typo.patch
new file mode 100644
index 000000000000..6ad17327437b
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.30-xsession-typo.patch
@@ -0,0 +1,28 @@
+From 5b2b8e554d19a37ea5b5e0a1ba2d1b67328863f5 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 18 Dec 2012 19:09:15 -0500
+Subject: [PATCH] user: Fix x-session -> xsession property notification
+
+Introduced by commit 9982e50b891074a711c43c5d7acc71cb793eb14d
+
+https://bugs.freedesktop.org/show_bug.cgi?id=58493
+---
+ src/user.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/user.c b/src/user.c
+index 9d84e11..bc54a38 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -315,7 +315,7 @@ user_update_from_keyfile (User     *user,
+         if (s != NULL) {
+                 g_free (user->x_session);
+                 user->x_session = s;
+-                g_object_notify (G_OBJECT (user), "x-session");
++                g_object_notify (G_OBJECT (user), "xsession");
+         }
+ 
+         s = g_key_file_get_string (keyfile, "User", "Email", NULL);
+-- 
+1.8.1
+