Version bump, drop old.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

4 files changed, 48 insertions, 54 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index 24c28b484815..3e477ceef716 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/accountsservice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.16 2012/07/19 20:22:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.17 2012/09/12 21:29:25 tetromino Exp $
+
+*accountsservice-0.6.24 (12 Sep 2012)
+
+  12 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -accountsservice-0.6.15.ebuild, -accountsservice-0.6.21.ebuild,
+  +accountsservice-0.6.24.ebuild,
+  +files/accountsservice-0.6.24-dont-delete-root.patch:
+  Version bump, drop old.
 
   19 Jul 2012; Markus Meier <maekke@gentoo.org> accountsservice-0.6.22.ebuild:
   arm stable, bug #424842
diff --git a/sys-apps/accountsservice/accountsservice-0.6.15.ebuild b/sys-apps/accountsservice/accountsservice-0.6.15.ebuild
deleted file mode 100644
index d931af1c4f04..000000000000
--- a/sys-apps/accountsservice/accountsservice-0.6.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.15.ebuild,v 1.6 2012/05/27 18:15:14 mattst88 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm x86"
-IUSE="doc +introspection"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/dbus-glib
-	sys-auth/polkit
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto )"
-
-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)
-		$(systemd_with_unitdir)"
-	DOCS="AUTHORS NEWS README TODO"
-}
diff --git a/sys-apps/accountsservice/accountsservice-0.6.21.ebuild b/sys-apps/accountsservice/accountsservice-0.6.24.ebuild
index 0b9e76f0bcc9..d7d8c4dd9425 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.21.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.24.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.21.ebuild,v 1.4 2012/07/05 21:23:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.24.ebuild,v 1.1 2012/09/12 21:29:25 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 systemd
+inherit eutils gnome2 systemd vala
 
 DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
 HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
@@ -33,7 +35,9 @@ DEPEND="${RDEPEND}
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto )
-	vala? ( >=dev-lang/vala-0.16.1-r1:0.16[vapigen] )"
+	vala? (
+		>=dev-lang/vala-0.16.1-r1
+		$(vala_depend) )"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -51,12 +55,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+	# In next release
+	epatch "${FILESDIR}/${P}-dont-delete-root.patch"
+	use vala && vala_src_prepare
 	gnome2_src_prepare
-
-	# FIXME: write a sane version of vapigen.m4 that properly deals with
-	# versioned vapigen pkgconfig files, submit to vala upstream, and get
-	# ${PN} upstream to use it.
-	sed -e 's:vapigen_pkg_name=vapigen$:vapigen_pkg_name=vapigen-0.16:' \
-		-e 's: vapigen\([^a-z_-]\): $vapigen_pkg_name\1:' \
-		-i configure || die 'sed failed'
 }
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
new file mode 100644
index 000000000000..870acdc0accf
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.24-dont-delete-root.patch
@@ -0,0 +1,29 @@
+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
+