[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Eli Schwartz]

commit:     dc7c59fd6f0d36d1877ce9eac0fe593d40e87045
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 21:34:21 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 15:23:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7c59fd

sys-apps/systemd: use docdir configure option instead of moving files after

Meson may not support a builtin docdir option, but systemd has supported
one since v238. Use that to enforce installing those files in correctly
in PF.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sys-apps/systemd/systemd-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 1066771661ba..5a4e1aa66bdf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -295,6 +295,7 @@ src_configure() {
 multilib_src_configure() {
        local myconf=(
                --localstatedir="${EPREFIX}/var"
+               -Ddocdir="share/doc/${PF}"
                # default is developer, bug 918671
                -Dmode=release
                -Dsupport-url="https://gentoo.org/support/";
@@ -401,9 +402,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-       # meson doesn't know about docdir
-       mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
        einstalldocs
        dodoc "${FILESDIR}"/nsswitch.conf