Version bump with bugfixes and systemd support. Drop old.

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

5 files changed, 129 insertions, 45 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index fddaf9057b84..0197bc4ece6e 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2012/05/27 18:15:14 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.10 2012/06/25 08:07:56 tetromino Exp $
+
+*accountsservice-0.6.21 (25 Jun 2012)
+
+  25 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -accountsservice-0.6.14.ebuild, +accountsservice-0.6.21.ebuild,
+  +files/accountsservice-0.6.21-gentoo-system-users.patch, metadata.xml:
+  Version bump with bugfixes and systemd support. Drop old.
 
   27 May 2012; Matt Turner <mattst88@gentoo.org> accountsservice-0.6.15.ebuild:
   Added ~alpha, bug 379651.
diff --git a/sys-apps/accountsservice/accountsservice-0.6.14.ebuild b/sys-apps/accountsservice/accountsservice-0.6.14.ebuild
deleted file mode 100644
index 357bc3fc69ca..000000000000
--- a/sys-apps/accountsservice/accountsservice-0.6.14.ebuild
+++ /dev/null
@@ -1,44 +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.14.ebuild,v 1.2 2012/05/04 09:17:27 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils 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="~amd64 ~arm ~x86"
-IUSE="+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"
-
-# Documentaton doesn't validate
-#RESTRICT="test"
-
-pkg_setup() {
-	# docbook docs don't validate, disable doc rebuild
-	G2CONF="${G2CONF}
-		--disable-static
-		--localstatedir=/var
-		--disable-docbook-docs
-		--disable-maintainer-mode
-		--disable-more-warnings
-		$(systemd_with_unitdir)
-		$(use_enable introspection)"
-	DOCS="AUTHORS NEWS README TODO"
-}
diff --git a/sys-apps/accountsservice/accountsservice-0.6.21.ebuild b/sys-apps/accountsservice/accountsservice-0.6.21.ebuild
new file mode 100644
index 000000000000..00dc948d6430
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-0.6.21.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2012/06/25 08:07:56 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils 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 systemd vala"
+
+# Want glib-2.32 for generated bindings
+RDEPEND=">=dev-libs/glib-2.32:2
+	sys-auth/polkit
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	systemd? ( >=sys-apps/systemd-43 )
+	!systemd? ( sys-auth/consolekit )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto )
+	vala? ( >=dev-lang/vala-0.16.1-r1:0.16[vapigen] )"
+
+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"
+	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.21-gentoo-system-users.patch b/sys-apps/accountsservice/files/accountsservice-0.6.21-gentoo-system-users.patch
new file mode 100644
index 000000000000..1424f3dc75d0
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.21-gentoo-system-users.patch
@@ -0,0 +1,58 @@
+From 3fe83b83f422d08f0030195f4951b332706ad7f8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 25 Jun 2012 01:48:39 -0400
+Subject: [PATCH] Additional Gentoo system user accounts with non-trivial
+ login shell
+
+---
+ src/daemon.c |   34 ++++++++++++++++++++++++++++++++++
+ 1 files changed, 34 insertions(+), 0 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index d1708ca..2ad2aff 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -77,6 +77,40 @@ static const char *default_excludes[] = {
+         "games",
+         "man",
+         "at",
++        /* Additional Gentoo system users with non-trivial login shell */
++        "amanda",
++        "backuppc",
++        "drqueue",
++        "firebird",
++        "flexlm",
++        "foldingathome",
++        "geneweb",
++        "git",
++        "gnump3d",
++        "hacluster",
++        "hg",
++        "hsqldb",
++        "infinote",
++        "jffnms",
++        "klive",
++        "mailman",
++        "mpd",
++        "mythtv",
++        "nagios",
++        "nx",
++        "oneadmin",
++        "openvpn",
++        "p2p",
++        "phxd",
++        "resin",
++        "rplayd",
++        "scponly",
++        "secoff",
++        "tinyproxy",
++        "ttrssd",
++        "vboxguest",
++        "vdr",
++        "vdradmin",
+         NULL
+ };
+ 
+-- 
+1.7.8.6
+
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 44825d13c084..520c0d8ba24f 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -5,5 +5,8 @@
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>