Version bump, drop old.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

5 files changed, 59 insertions, 62 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/Manifest b/sys-apps/accountsservice/Manifest
index d2da87a368d3..4761b6677068 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -2,19 +2,22 @@
 Hash: SHA256
 
 AUX accountsservice-0.6.21-gentoo-system-users.patch 1320 SHA256 c8b8961cf9825c46c320237e0c48af5f253007de6499c4ac7da454c3f87ecf15 SHA512 3fe8c974bb036add475e8245ba9a3da595f167206bd504d64c4730de22a1c324bba171819719eb1a9d78e24210b3789f8467d20bfe40694a903ddc2ede6d06a7 WHIRLPOOL 45d95a97037c769cc77f456cea412e6a69b2e7604e890403686ae6457914312c250288fcc825ed8c812db67dfbc1d5a678d7a389f762d9c0d9b8a84b9f8ee56b
-DIST accountsservice-0.6.15.tar.xz 286480 SHA256 9feb3d58c5c739f2df4b5410404b29f16e3f4aa6739b685ceb12903f4d5ea867 SHA512 d5db091a63a63b68d71a53cac4a0c7d240fde530bfd8de744b998c9a1df901d84766bf1dbff155351789c27ae75286536d69ee3d886cbb74fd2d2b696cb8629b WHIRLPOOL 8c7a1ba9a11a4bcb5c97d6a88c4bdba159aad6ae3bebb04bf3823027ae7c3fef908863773530ecd22f6c4366739ea4bb86974eb64d9647f9725aeccab60fc1da
-DIST accountsservice-0.6.21.tar.xz 329916 SHA256 adf681cef68852b65d57de7102483ef0cf31175ea0bbc3bad59957259dc64192 SHA512 44a43765627c7b1395d857e7233bff01b847cbae2de1554f0257c7fabe596b1d44cc6661b864b017107fade05b751acbb03f119fab338eafa942aa49716d2b94 WHIRLPOOL 939b671480bf8c80c08843f7319f75ad7cf505bf4f4ec5303739dfddb8e57cc4d2059bb7112f8b0482f93f165d211a262e1c67372f88a008ea9146cd7d3459a2
+AUX accountsservice-0.6.24-dont-delete-root.patch 1273 SHA256 e55bef968ccf438a196453220d52b2d53b4c53d5810fdc678914163f64b55045 SHA512 bbcbbddd1257f04f541754f140d17c6df215990928cb23fed8a4a651e29c5382f39b7d3f79dc044ae6bf60fa8266ef56291d58c0015ff417d89645f3dac6d861 WHIRLPOOL 4109dd90387889428720ec32545f80eca69a8dc15a24165ab4b89ac7dae6a52cf139c8cb335a590905eefbd400ee0ddc546a8329df03789452f4e697762b88cb
 DIST accountsservice-0.6.22.tar.xz 331028 SHA256 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd SHA512 984f5180310683af0320d0294e97556a87658dc773e64d3105825ce7111d82e4370d8cf5172c6a6074eeca96aa158e8120d2a1092040313f482d051fa1e8ab1f WHIRLPOOL 68c1255131a7e4e03f2a6fa763ac89f53feb6697a3e8481a68ef77976bb694a296f18cd9df9828351fe201f4842369d40518093d78e47cd1c91e166061866c0e
-EBUILD accountsservice-0.6.15.ebuild 1182 SHA256 b783ec50ab10677db443330d24afe17ded8034803f3fe88684cab95f001f7989 SHA512 2be7b2b4a4474566c90fb13e77cab25ae8531ce447bf944233ce13f6a861022164554c25dd8132bb744d9755923a2a2e7b7e741043847a858ba84bc69b83755b WHIRLPOOL 2c6422c0cd1af33521c6a80448e800af854a2d7a7b304e26c02c4f41d24f14758e862978d350c2fb0c62731a5c17200bc46ef50a52b0068c011ba54202e87938
-EBUILD accountsservice-0.6.21.ebuild 1881 SHA256 a7a9d339449d73115c261e30d85b3441e477d351bfe85ef5f60311194e1ace86 SHA512 b316bb4517e7f33706b80df63557c1ea9800dd32e5a046eda7976b65ab62579481e5aa6759b52db3e69ac8f30786b895fc5c9d75e4ec9b564f990e17194608ad WHIRLPOOL 71948ebf6d82b4b1211759985967f7c439d20a7eb84eed22073009c89205afa6d59a679a7d508c4afa449080e4733692cb6945409c1750924ad09a15444c20f1
+DIST accountsservice-0.6.24.tar.xz 332928 SHA256 f2c0886c5d6d80453eebd4a91e6081231cde6cc436d55b9425d2cc0332a85623 SHA512 10910973e7f3bd8884e1c7dd5e4b6c1c9d1b2e0559a7360385024def7184e7f13bacec5ffb91826a0ffdfb7bd545448a3af0354d84ad298723a3f50ef52aceea WHIRLPOOL 301da844bdb37df2d41839bb294d0d802230f42f9991cf1e105e15e02a73834924e166973b6a48781b26fa26f46ed56109a5e583541b2651a986d5ebdedb4baf
 EBUILD accountsservice-0.6.22-r10.ebuild 1885 SHA256 256933c92344fdcc28507d86ed5cf6ddbcdd9c24f8cdd03b5154f8ead793623c SHA512 83664b80a62b8096bd165f8bce8c747ed9342b76ea275382c0b73a712f8865cbca5f948f400412e613a439e2d171cfd299e5f6347c2bd4d3f12d1c0462cfdb26 WHIRLPOOL 31e98782239ba4c8b899bb9027b3a1c6b702231cd15bff12fcdf05169913fbd394d15e9323870a0c6c89e29822b6608f05210c96ca37a79602bc2db62dc5c4b3
 EBUILD accountsservice-0.6.22.ebuild 1921 SHA256 faf7b4b1df83c01043720ae1763d9dc9f903fcf6fbbe960048324d043c18d57e SHA512 9524c878545d8f9cb90800c320548bbca75126cd682d69486647f702f4aec82263073da3f6d0d2c776933353ca65b46e198a1ab0eb036fe2a4abd459136caf29 WHIRLPOOL b75394dca979809a9edc4ec7776d4ea86906cd06fea4759b23e3094624bbc8e6a7abec7b9edf4a0e9011ce1ac4ec70ef2211b6d966c8fb64285471159c46e288
-MISC ChangeLog 3548 SHA256 8f2c9ae461626dfa94ece43abc8d217075a27934cc58ecf94bc64afa1315fba4 SHA512 77d71b97a7a304e033489498e024fc3c038f0911b1e35f8ddc138c9add666224eb8a6d8af4ab111e8ac032bbab133b3a074b285a78e9e0c7e42c7b614aa36b1c WHIRLPOOL 7f3d678318cf6e85f55c923dfce68c5bae0e650c7e8abfc2f0f9023c3488423324b3544636c3a7f4e4a1f14997f44ec5d9993ef130e239df30375b4652cc4665
+EBUILD accountsservice-0.6.24.ebuild 1713 SHA256 eda947c64a827adb7f5996b1ec0e9c55664f48a416da1c07da38c5978c14cc0b SHA512 5cf0d9a929d932c0d726a3496760b6ec4107b502c51ccec8d73111a7fca065beb347086ef6e59368977fce7fc443205616705c195cd9e9e6db20daa58f7a498a WHIRLPOOL 6257f4e35b35efc4de802dddd423988807dcadba58d8b37c132be3bb6f002512b2f60254d1befaf129b4ff087804e7b591731d2ea29adbf7c621e17ed2e4a359
+MISC ChangeLog 3832 SHA256 4cdc83456bd778c80b711f990d3998d378637c8d1d87defc4e5e9c9f3f6ac1af SHA512 4cad932620166a8d4970a53c10922252a170cf6fc407e5e8c63abd12b1384956673605d340373a0e7b7a7cd5b05b2dfcf8d5040f8e70ebeebab1eff7754656f4 WHIRLPOOL cf554384355889b726be1d052d29e318d235f090f3bd72011560605c9045162059e96e5bf02f610cb287ce7ee759aaa1c03fcbd2f7ec2b3b5d55bc4038e0624d
 MISC metadata.xml 477 SHA256 cfe68d08f14d29166ff46c0e1187002e7c895307deab521b2b78637cbe45e8ac SHA512 d60228f73ebf1a56d604b152d928ebfe5f81d7d777f471f4808a07aa9c6fc3460d7c7d71d183c4566def28a2b1319da4e9dfd71886d8a8d85ddf3c57e4de2b13 WHIRLPOOL 6562e107ed6dd93aac173cb28a532cd1ee06a2d1378a8d552234d41e615ff8f9c0d219aa016a85cb776cb2c3c0ebbad84de2331e809157e64f96604eef863e86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAIbVsACgkQkKaRLQcq0GKfJwCgr/G0jTteudjhJc9uc0ggm0IX
-d3sAnRqiN25Pkmpz2Pupo5AAH/9OSRQO
-=/ERD
+iQEcBAEBCAAGBQJQUP67AAoJEJ0WA1zPCt1hsOIH/jxlhV1aGu69NCfbnELWujzc
+dMuY0Xu5iBDyOL2DsPGJAINuTViCZ7dRZWbc2V3Gzz3twFkH8rfYUtR4V2X67V53
+kXyZUe6szSTbzPyY3u+W2lATZIVmpSKdzKxoT9kQNXN+NaCxqstfHXHiNVc+cOAj
+GGa/4G+xP8H28x/jl5VYIXcE+8gq2YSemEmMsYchGvSqMv/quChR3R1mGtW8aUC3
+Q0OfTFi7el2Kd8sLgs+YzMGkdOSM4o0qMChdVdVFaduMQQ8GiSutqSbjkfOIwiNh
+I9AlJxOtQnXS+tzZAlaHmZxD1Gw2wA+KwNdqiiS8wQuj30pzBNNzdbXfEh4W5oM=
+=+qOb
 -----END PGP SIGNATURE-----
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
+