--- /var/portage/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ accountsservice-0.6.55.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_EAUTORECONF="yes"
+EAPI=7
 
-inherit gnome2 systemd
+inherit meson systemd
 
 DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
@@ -12,7 +11,7 @@
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc consolekit elogind +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
@@ -25,11 +24,11 @@
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	systemd? ( >=sys-apps/systemd-186:0= )
 "
-DEPEND="${CDEPEND}
+DEPEND="${CDEPEND}"
+BDEPEND="
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
@@ -42,20 +41,25 @@
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch
-
-	# lib: don't set loaded state until seat is fetched (from 'master')
-	"${FILESDIR}"/${P}-loaded-state.patch
 )
 
 src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-more-warnings \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-admin-group="wheel" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable doc docbook-docs) \
-		$(use_enable elogind) \
-		$(use_enable introspection) \
-		$(use_enable systemd)
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		-Dsystemd="$(usex systemd true false)"
+		-Delogind="$(usex elogind true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Ddocbook="$(usex doc true false)"
+		-Dgtk-doc="true"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	keepdir /var/lib/AccountsService/icons
+	keepdir /var/lib/AccountsService/users
 }