gentoo resync : 02.02.2022

5 files changed, 174 insertions, 2 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index a1ba4002b2ba..2a1caa8c3bdf 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,4 +1,8 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
+AUX accountsservice-0.6.55-meson-0.61-build.patch 659 BLAKE2B 08e271eb7228ed9b1a23633b35d9b1d8d9bf5499f734af9fce12fd642baa6d0aafd4d34a639a281467677f1e4948c82b33eb08af81b425d7bf0fb8e353c2ab94 SHA512 8a0ec9ebfe543afa3cdc4c68da67f9b22a5b08191eb664bb68404d868e31dbf584114f91b638ad1e0dd63635b45f58ccffb66defe4b9452ecdf6e591a77e2f6a
+AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
-EBUILD accountsservice-0.6.55-r1.ebuild 1738 BLAKE2B bf31c4ffd3aa68978ebc92786e25e09b3b6acc264bb36cc68d120de68b0d73a847b711861bdd61736bc95f784188acab11bbb76467cb38446304f9dd0c270660 SHA512 3953008aa4ab7ea5f7bf2e9bf772ea41cdfe4cc3b5336a266da4fa0afdb3ae99f596442f3e10eabc9b27fb4ef821aea42f95f9c4761324750efec1c1809e461f
+DIST accountsservice-22.04.62.tar.xz 101740 BLAKE2B b0514e2160560816fa64688072c0534ad6375ef699459e24a083f738fe8388c2f13b2ea37acbb50c64b9823fc5391356deddfd964e22d9db722bfe6816009cb8 SHA512 4d37b09c1cb1b55dc474cb76c53cbf0a3172bb0e6a0782405c0c09b9680ee3ac02103dfd57777bf131649de2ad0ebc8063362fa7ca18edfd2cb6d2a38a886900
+EBUILD accountsservice-0.6.55-r1.ebuild 1781 BLAKE2B 4b8b57fc79952adea5c00df80e5294b0233546602f848dab24ebdcf0db0cd4e876ff0525d4b610c0f777019863bd441939ac27cb94090d0040b1fecf60bd6bd0 SHA512 fc3f0cab3f34d70c5849e6b2924d48a639027ae870e7840a348310638d238d350ce24561fc3f23d7768a790aeaad1e568767ea0d9e6ab616f969cefb0809eea6
+EBUILD accountsservice-22.04.62.ebuild 2020 BLAKE2B 778e776279e9aaef2f96ef85f9e9f1e540090d7c9db2130a216019716d08bee5eda49d051f3744e27b3c5baafc4dbbc4325a09182b97fe409ccb2d3d0cf67190 SHA512 254de9eff3009c5cf7b37497623d7437d1b5002bedce233efc8fb59afd6650c79256a9f4a56febdf66390a50afd31967b2a69c6ed720cf3fbf697cf82ae75096
 MISC metadata.xml 435 BLAKE2B 15950bf42bdf008f146f8bb89c9b8f29734eb244c7c8f664d6b9cfef3999b241de1fbec5bec7ed9cd874875a49b814001662122b488e5137a83f4ae6c8eef7aa SHA512 a5c93f2a4ab9453a20e6a6f9de924f5eff56a3e16a994c6ff09892a4739dbddc4d422bf4ad4d20c0772433932542b797277c2109bd39695588c1c02ef3d172dd
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
index 9c0dcab956dd..04cf8d0705b8 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 src_configure() {
diff --git a/sys-apps/accountsservice/accountsservice-22.04.62.ebuild b/sys-apps/accountsservice/accountsservice-22.04.62.ebuild
new file mode 100644
index 000000000000..cc2ca7bb4783
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-22.04.62.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="doc elogind gtk-doc +introspection selinux systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.63.5:2
+	sys-auth/polkit
+	virtual/libcrypt:=
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+}
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch
new file mode 100644
index 000000000000..d56f4b7e63b8
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
+https://bugs.gentoo.org/831465
+
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: [PATCH] Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+GitLab
diff --git a/sys-apps/accountsservice/files/accountsservice-22.04.62-gentoo-system-users.patch b/sys-apps/accountsservice/files/accountsservice-22.04.62-gentoo-system-users.patch
new file mode 100644
index 000000000000..d65fa2f89d8a
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-22.04.62-gentoo-system-users.patch
@@ -0,0 +1,58 @@
+From 0db673b94a6031640ae5faa3b79c4a1fea078350 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 30 Jan 2022 12:00:09 -0800
+Subject: [PATCH] Add more users
+
+---
+ src/user-classify.c | 35 ++++++++++++++++++++++++++++++++++-
+ 1 file changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/src/user-classify.c b/src/user-classify.c
+index 9224905..70f1877 100644
+--- a/src/user-classify.c
++++ b/src/user-classify.c
+@@ -52,7 +52,40 @@ static const char *default_excludes[] = {
+         "at",
+         "gdm",
+         "gnome-initial-setup",
+-        "git"
++        "git",
++        /* Additional Gentoo system users with non-trivial login shell */
++        "amanda",
++        "backuppc",
++        "drqueue",
++        "firebird",
++        "flexlm",
++        "foldingathome",
++        "geneweb",
++        "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",
+ };
+ 
+ static gboolean
+-- 
+2.34.1
+