From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00C38158042 for ; Tue, 29 Oct 2024 22:00:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DF09E0805; Tue, 29 Oct 2024 22:00:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28573E0805 for ; Tue, 29 Oct 2024 22:00:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64D9E335C7E for ; Tue, 29 Oct 2024 22:00:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CABEF1626 for ; Tue, 29 Oct 2024 22:00:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730239199.84d7744253a8f1a4c81807574d54e3fb15c2a89d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/389-ds-base/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/389-ds-base/389-ds-base-3.0.2.ebuild X-VCS-Directories: net-nds/389-ds-base/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 84d7744253a8f1a4c81807574d54e3fb15c2a89d X-VCS-Branch: master Date: Tue, 29 Oct 2024 22:00:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e07af255-8c4b-456b-bad6-63d7260ec04c X-Archives-Hash: 9167955333f5c76aa691bef21f8f2700 commit: 84d7744253a8f1a4c81807574d54e3fb15c2a89d Author: Anders Larsson larsson xyz> AuthorDate: Tue Oct 29 20:27:25 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 29 21:59:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d77442 net-nds/389-ds-base: Fix systemd support Bug: https://bugs.gentoo.org/942473 Signed-off-by: Anders Larsson larsson.xyz> Closes: https://github.com/gentoo/gentoo/pull/39152 Signed-off-by: Sam James gentoo.org> net-nds/389-ds-base/389-ds-base-3.0.2.ebuild | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild b/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild index eb95bd5965db..5a5199ac853f 100644 --- a/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild +++ b/net-nds/389-ds-base/389-ds-base-3.0.2.ebuild @@ -231,7 +231,11 @@ src_configure() { $(use_enable ldapi) $(use_with selinux) $(use_with !systemd initddir "/etc/init.d") + $(use_with systemd) $(use_enable test cmocka) + --with-systemdgroupname="dirsrv.target" + --with-tmpfiles-d="${EPREFIX}/usr/lib/tmpfiles.d" + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --enable-rust-offline --with-pythonexec="${PYTHON}" --with-fhs @@ -240,15 +244,6 @@ src_configure() { --disable-cockpit ) - # https://github.com/389ds/389-ds-base/issues/4292 part 2 - # creates wrongly named unit file if == no - use systemd && myconf+=( - $(use_with systemd) - $(use_with systemdgroupname "dirsrv.target") - $(use_with tmpfiles-d "/usr/lib/tmpfiles.d") - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - econf "${myeconfargs[@]}" rm .cargo/config || die