app-accessibility/at-spi2-core-2.30.0: fixes

systemd_get_userunitdir needs to be used for systemd user service files.
Add missing glib-utils and docbook-xml-dtd deps.
We need to clear or set up XDG vars for introspection build to not fail for
some people.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
index 1e699cd04fad1381e9210eacd573042d53e87a01..2da4d8357722763e8874e04befce10bbe9748ab1 100644 (file)
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome.org meson multilib-minimal virtualx
+inherit gnome.org meson multilib-minimal systemd virtualx xdg
 
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
@@ -14,8 +14,8 @@ IUSE="X gtk-doc +introspection"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
-       >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
        >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
        introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
        X? (
                x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -24,7 +24,10 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       gtk-doc? ( >=dev-util/gtk-doc-1.25 )
+       dev-util/glib-utils
+       gtk-doc? (
+               >=dev-util/gtk-doc-1.25
+               app-text/docbook-xml-dtd:4.3 )
        >=sys-devel/gettext-0.19.8
        virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
@@ -39,6 +42,7 @@ multilib_src_configure() {
                -Denable_docs=$(multilib_native_usex gtk-doc true false)
                -Denable-introspection=$(multilib_native_usex introspection)
                -Denable-x11=$(usex X)
+               -Dsystemd_user_dir="$(systemd_get_userunitdir)"
        )
        meson_src_configure
 }