gentoo resync : 20.03.2022

3 files changed, 26 insertions, 13 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 2a1caa8c3bdf..ffe717445a7f 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,8 +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
-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
+DIST accountsservice-22.07.5.tar.xz 101688 BLAKE2B db8e5001f0b81b89c105d15557d5c62251ca58e4fad08f3cbfd52881b05980ccbb693766347c5cde640dcf3823a59f667fe15ec0c8e04cdd226915f91cea90a6 SHA512 9099abc9d8db58672db01e6ba9b23ba7bc8ed910ac001499d2a241089f55eafac47a482811cba80b1d6ee11df03a384e8ef2fd87df3b1125a8cf97c580177534
+DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
+EBUILD accountsservice-22.07.5.ebuild 2014 BLAKE2B fe0b88fdd68bcce8774090c8c043e61aea1cbfc85b02dac1f85b08d54d3d89c2ec45d337eb357e9e53762c6e01ef4c9a258775c9de0f76837011074904b5ba30 SHA512 43b7f3e683bbafacf13ff0a87f372b3c4372091545431601558ea40ef3af91f59b1e7f66e866bfc04eba0ed47e19e551fca959efad2dc9febac2bf2b9da7c128
+EBUILD accountsservice-22.08.8.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-22.07.5.ebuild
index 04cf8d0705b8..d2356b03733d 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.07.5.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-inherit meson systemd
+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/"
@@ -13,11 +13,12 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="doc elogind gtk-doc +introspection selinux systemd"
+IUSE="doc elogind gtk-doc +introspection selinux systemd test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
 CDEPEND="
-	>=dev-libs/glib-2.44:2
+	>=dev-libs/glib-2.63.5:2
 	sys-auth/polkit
 	virtual/libcrypt:=
 	elogind? ( >=sys-auth/elogind-229.4 )
@@ -32,30 +33,42 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto )
+		app-text/xmlto
+	)
 	gtk-doc? (
 		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
+		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}-0.6.35-gentoo-system-users.patch
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
+	"${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 systemd)
 		$(meson_use elogind)
 		$(meson_use introspection)
 		$(meson_use doc docbook)
 		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=false
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/accountsservice/accountsservice-22.04.62.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
index cc2ca7bb4783..cc2ca7bb4783 100644
--- a/sys-apps/accountsservice/accountsservice-22.04.62.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild