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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 135 insertions, 61 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/Manifest b/sys-apps/accountsservice/Manifest
index 4f128f1e24cf..a11b3087e4d1 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX accountsservice-0.6.21-gentoo-system-users.patch 1320 SHA256 c8b8961cf9825c46c320237e0c48af5f253007de6499c4ac7da454c3f87ecf15 SHA512 3fe8c974bb036add475e8245ba9a3da595f167206bd504d64c4730de22a1c324bba171819719eb1a9d78e24210b3789f8467d20bfe40694a903ddc2ede6d06a7 WHIRLPOOL 45d95a97037c769cc77f456cea412e6a69b2e7604e890403686ae6457914312c250288fcc825ed8c812db67dfbc1d5a678d7a389f762d9c0d9b8a84b9f8ee56b
-AUX accountsservice-0.6.24-dont-delete-root.patch 1273 SHA256 e55bef968ccf438a196453220d52b2d53b4c53d5810fdc678914163f64b55045 SHA512 bbcbbddd1257f04f541754f140d17c6df215990928cb23fed8a4a651e29c5382f39b7d3f79dc044ae6bf60fa8266ef56291d58c0015ff417d89645f3dac6d861 WHIRLPOOL 4109dd90387889428720ec32545f80eca69a8dc15a24165ab4b89ac7dae6a52cf139c8cb335a590905eefbd400ee0ddc546a8329df03789452f4e697762b88cb
 AUX accountsservice-0.6.29-32bit-crash.patch 908 SHA256 f85673a60fb6fb20d015c4a5b09aebd739d2554965e02861488691b8e3fd762e SHA512 0defd98b741e64507e152977bc57a4cf8b689fe9cfc3e69725d8e24c77562951eccbd73c24ed481f1855237b60bf35d2cd105262a1d355e198930b98d416bcd5 WHIRLPOOL aa4722e7472a2a0e7f7b479e3c8692f88ae09c818dcab70c6cd9267c348d0f9458788a36104c395fb7c76c3529a600070ee8000ccff29e0aee3c329ac2bce51c
+AUX accountsservice-0.6.30-login-history-variant.patch 1913 SHA256 a5d59dec1d630e4458801f251a03e23443757fb5349a577e799d5ccf56c3eb10 SHA512 f6697c5c4ced37ef82aa9159e30f4287f4ed75252a2959440b21f7a2ef7329bdfe8ae1a70f023e785b6b181e74f02a23377cf4bc1cbc14f83b0fe027775f10ec WHIRLPOOL 09460751ce90aae0c856779dec1df88e65d1025a83d9692bd24bde09eb9887101735081aa86d296fb16b0ca8a51758a9aebcb9268ab35d51e6d3a163e9aba741
+AUX accountsservice-0.6.30-xsession-typo.patch 899 SHA256 d3d9caaa18ee1707fd75ca8a96ca45f6b1e88551fd6651324f3c347475a0b863 SHA512 457d985be1ab201f895e260bf5fb702976069234e5043618c05c8e45f7cea5a21b1f3db930b9eac77a4624f1e288a1e78fd6cd2f2e99bd6f92208e8c32fcb4a2 WHIRLPOOL ca349eaae087bcaf280d7633f9f98ae3b48e9f6b3df12c089d1c6bbf6b079a99fecb66f44892de8e7e5c13cefdab161d4acf4897a10b5d38f23a490b28f4b1dc
 DIST accountsservice-0.6.22.tar.xz 331028 SHA256 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd SHA512 984f5180310683af0320d0294e97556a87658dc773e64d3105825ce7111d82e4370d8cf5172c6a6074eeca96aa158e8120d2a1092040313f482d051fa1e8ab1f WHIRLPOOL 68c1255131a7e4e03f2a6fa763ac89f53feb6697a3e8481a68ef77976bb694a296f18cd9df9828351fe201f4842369d40518093d78e47cd1c91e166061866c0e
-DIST accountsservice-0.6.25.tar.xz 334628 SHA256 5600a8ffe946d5cef63988767f221bc338b79f3012188d9dff6caa5f7b25fe6c SHA512 7cca2a0e773b68b5a5daefbf540dde02b29b6647c278a3411a501cef366a05ad5e64bbe713175ecb28352ba5052b7897536735cdc5790ee49a8499e84a56ba73 WHIRLPOOL fb99df6c16d87cbc3d21019c90bc0875319a4aa26b7aedbc8c2f386ab2044adc8e319dda0db8be02bc692d2026b316a6fa51d693b74f65a940855948ce4942f1
 DIST accountsservice-0.6.29.tar.xz 355024 SHA256 67d97e05a4c3c6f2f44a6d6cd3391ae6decce1296eb9ab918ac2899fab7f62cc SHA512 07ac2fb40db7f6a2855a1305d5956133445f0760268c2b1b71add96f9bd8fe98388428872822bdfc8b2f755583897054e55051ecac3e69c77a59fc4551f2c763 WHIRLPOOL 27bbda33edd76d1f685a9ca50a0763d131c5182a5cd3b869437fd4d4407bb59fd0c5e942d82c7f19b3e2e90fb292a794cdc2133108a3074108b69f41799af08a
-EBUILD accountsservice-0.6.22.ebuild 1921 SHA256 faf7b4b1df83c01043720ae1763d9dc9f903fcf6fbbe960048324d043c18d57e SHA512 9524c878545d8f9cb90800c320548bbca75126cd682d69486647f702f4aec82263073da3f6d0d2c776933353ca65b46e198a1ab0eb036fe2a4abd459136caf29 WHIRLPOOL b75394dca979809a9edc4ec7776d4ea86906cd06fea4759b23e3094624bbc8e6a7abec7b9edf4a0e9011ce1ac4ec70ef2211b6d966c8fb64285471159c46e288
-EBUILD accountsservice-0.6.25.ebuild 1656 SHA256 68609964e605071c6d5ec9771bf70ef0a37cadae5278d4973c2e329d79ac2923 SHA512 83d10a9cf429cafc75755476e9a099b2308a12318d59117d0ac0129628ded9969b1ec1354aa0f27ed0d2aa7f5b8c44a373ce7d309f6b2340284d62dfe5df5871 WHIRLPOOL ca5517c42a34e532ba0a02c8718cadd2fa8b07a7b15aca4b5b770dfe00d5e54cd36b1fbd599908f8c9531582711b8b3ca2d1564591432142cdcae0b1ec6e2a0e
-EBUILD accountsservice-0.6.29-r1.ebuild 1801 SHA256 4468bb658384e71422af01101acb4d70cbc579ce7da99c01270c1e26074a04b3 SHA512 96bb771087c8dbff6885109e7b7e54d02b2d251d05502bdc3457b45e1c5988b01dc3fe65f1d044429b918174dc0fc2e8f17bf02d42356e2a24c29cb599e8841b WHIRLPOOL a78c39c1621f413020a1355daf2f122cce0c3f43b1a52a4b2eeb5dda2c32ba87cd3fcfa96d9dfaaeb608b9ed097b73b221a742cd1346aadffeee5858c89b575a
-MISC ChangeLog 4962 SHA256 e688df04abfea543b37009cfd22f307befc5ccf7ed18d284566567e8a14b73ee SHA512 e1f45ae6c850835ca807d3262cbb9f261283faef14bad21e9b67a408e26163fc1779bf1499298b66dfc301ae44f014212fb29746584ed6193f954ad45412d19d WHIRLPOOL 38af9d32472ee6ad57793aca60c5f1029f750c084c4cbccb4bcb86449450535842d6f15e6cebecaf22835d01fa4820ebb57b206bba084146a944d633f92a1c82
+DIST accountsservice-0.6.30.tar.xz 355448 SHA256 34400da6b95fbcb04a9b0202ec2805c5ffb04202d8469c17662830636b31093f SHA512 4c99f3e965a7d3b88d528517df236e2ca119f68fcf505f4df20d2e7550ee14b1fba757f5801214ac3a32580ae32b7bc66d95312a83a66277105610f489cc9fae WHIRLPOOL 0e4da7fb87d5dbc078e17b8c47f245acaa0cf8ea68f089efdc1a38bfde201885bef94f17aa698e29e94e532dd43a16f0182b93de9b3991dfbec1239f6076080d
+EBUILD accountsservice-0.6.22.ebuild 1925 SHA256 04d2536b77a6814080b1a58972bc24f3f3d0d1c4b4fdccd81925f1241d7aedac SHA512 344cf6228565e977e4241335d590c32850859b1dc79473889e75c700e06a7936d0bee228a7ca61acbbf6aa77e23788f787395b4a764dd32575c12882bed42bc6 WHIRLPOOL 8864770d622b4527a6b3c4f5e5216e37e8f0b0394a2d47446bd712515dc89d7addf55538337c77d2f10b00a3c352262d58996ffbbadc0c2ab22ff723376f2017
+EBUILD accountsservice-0.6.29-r1.ebuild 1808 SHA256 8fb81eb2b4cc2c8943fa23ae558ceb2335a943d3f05a1964fcdec6d23234d8fc SHA512 c802f46021635f738bd581d6323c6b79812cb8fd4b168d5eddba67ce0c089c2e03b127426248c4dc32bc4835f2fd4f41b09adc91cd339d4e4c767b1f0fd94847 WHIRLPOOL d4251d693f779b64ae0ef693cdbc5a501d663549aa8ea80783283023db6e9934a49d587940ba734abe4ab00e274a421558b3da75d84f28d6ce16fd18a8439481
+EBUILD accountsservice-0.6.30.ebuild 1821 SHA256 f1ddb5841ee57da5d22c89b7d1685b038168d08dfb21b064d3c1e6e006fb9512 SHA512 790bb953089daf814a6b903dda698a7cb2cd944237124068c001e0fa0a8c2e3275d7c0c3b0aed428d0b89afebc02130a338947243aea6e852b57db569b94431e WHIRLPOOL 32093a06dc731dd01e6eab8a7bb2d13f19e634b75a56409ea57f8ffbe0783e73ba1e66d0d09b9cfaf13a695cd61efed80a9c79b077e56c34dac6282bf1eb02dd
+MISC ChangeLog 5458 SHA256 e517c7b3af368346f5dcb8b67db8def71fb1f56d74cb6b8a9d4fcbf4a8855b4f SHA512 8b1db62a43178cdfa81d058d2449d23cdae7b75525e154f2b4b27f149f6617e79629d5e72201a973de9de8ecd8c52a7c8847dfe74c26078dde5ae769e7ac024a WHIRLPOOL 9bc09783bffb6262e451d7c2dc311515c5a0ec698879f3024609d187a29d26140284b526605b589a4e6dfefa3e936e15d4ad6d3f3db7f99a0918c8f8d000eca5
 MISC metadata.xml 477 SHA256 cfe68d08f14d29166ff46c0e1187002e7c895307deab521b2b78637cbe45e8ac SHA512 d60228f73ebf1a56d604b152d928ebfe5f81d7d777f471f4808a07aa9c6fc3460d7c7d71d183c4566def28a2b1319da4e9dfd71886d8a8d85ddf3c57e4de2b13 WHIRLPOOL 6562e107ed6dd93aac173cb28a532cd1ee06a2d1378a8d552234d41e615ff8f9c0d219aa016a85cb776cb2c3c0ebbad84de2331e809157e64f96604eef863e86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ6hlNAAoJEJ0WA1zPCt1h11MIAJFIU1syk2wZeNp0RVRRfOPt
+2nouxwIdEe7GZiq3h2g7lrkasKLcvGEfFu+gMJKR2w/5gS2zxx4bBEUXgtcwRQuH
+Uo49Sui+t4ep6tgm7sA8ToZhp5pbkGqP7xpfHCzdhQ3c6nZ6Epc5mTKvwuXiaMZN
+OJ0IF7HdF/CAM+amo4RFyyqF/PSNwyD577kdfMpMC+SX4QAkBotOHYXoyopz0YxO
+pVAE8LsFswHsHaMllAXJFzg4WYE6UJb6aKB2IMkbxJuOD8GYwH14cWAkRUvezEwZ
+d7lVk+IKznffd8k/wiClLEhBptHjABKbRtvtIK/oShjJaILuV/NT/lp6KYpgAv0=
+=UrbE
+-----END PGP SIGNATURE-----
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
+