gentoo auto-resync : 30:10:2024 - 03:04:35

5 files changed, 7 insertions, 12 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
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 66e1351c7d35..2e86eb9ca41e 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -105,5 +105,5 @@ DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
-EBUILD 389-ds-base-3.0.2.ebuild 7902 BLAKE2B ede84e75db6f7f7d6fc66b7890a351ecec3f1d335c50950be0e56a654f741de97cfb9b16044bf65b91243a4fafb43dd46a13caffcb7116fa8cf6cdeeb8f4916b SHA512 0a259f7e703d5b8c48311ac1597f70a00c45270bbdbe047014887efc2e5ee0c66bd72d53a99e9731bc7394ba81e0c82d3782ba71f84860e13349f62972c28613
+EBUILD 389-ds-base-3.0.2.ebuild 7769 BLAKE2B e925ec32f7878a8180dbf2bbbc4ceb8f54ec813cfb9c088577eb35d76fe660b36272107f4382bb109666788fbb91005dcc55d3a6beff47b4b49d1edf5744df4c SHA512 ddf6ddea05fe21eb19374ff648285dd323fa2a5027b5120e2d6b841a5d95affdc1f2155d208ef3bcdba02db985b182df9c773f8ea15fac55f46dc51a7fc07c06
 MISC metadata.xml 1582 BLAKE2B b29c4633cc0264cfc762327d8b24f21abed6a0e7b92d093d46826945f500d73898a488003d00a4c1fd2feef469a095ef3fc3d55c710f1c6543fb469e088ce2fd SHA512 6413a53a8494cb491bfdabfb4f097f657f86163e33e60ea0c7c1f02079a44d2e487ab2fd72a15f0e34d66ce840d52f058212b97213e45f50069d333a910dc83f
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 2b3561c16c09..40609d154d92 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index deb58c6a4e6e..b035d0e13551 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -4,5 +4,5 @@ AUX ldapvi-1.7-posix-unlocked.patch 648 BLAKE2B e799ab8ba399528c3e4469f6f287c56b
 DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925
 EBUILD ldapvi-1.7_p20101214-r5.ebuild 1107 BLAKE2B 5d4b2604aa0ec38e11c7c99ebb1cd91796661eb26565be24411bf27520c682ad809bda7a2b8651cc9796bb3a1c75fbae830718f39096d55d31797fd604e217c8 SHA512 207af68618c2954514ebeed661e3d8b2f9eaa2d303f5aff946b829feed3767a5f3a5039d1e63a5e2f4974b56d695f21345dc7b08f09a165205394cd6648750de
 EBUILD ldapvi-1.7_p20101214-r6.ebuild 1166 BLAKE2B 965db608a7cbbdb3db34277f77ea2a90c547554d82f77ba9e44ef2d39d592fa65a075e1218a96888991246c02e37827d35417f3006a958202c4077072b1d9f0d SHA512 415e53f5cb83c95a025529fcab4f2f21bd68197ee2c1b1cd21d33edc5541d5c18aefa7136f853fbc02b34ad88a999da24307f17a2aeeb47d3c2d8f1790c83365
-EBUILD ldapvi-1.7_p20101214-r7.ebuild 1212 BLAKE2B f365b300ef047c030ab89cb59cc0cbc74c362ab83cc5155fe2e03f30710ba3479bf21431df2f19824d4f383df3dfc18d9206d2d28515d2775094d1456b95a690 SHA512 737b5c3cde70f92ab45c9a3d5288e5891c51fed921789a55be2fcf4ede66b4a6879efe1df9bb348284a1df392702cecc078a3fb9f30db6c0e53989f362bbe482
+EBUILD ldapvi-1.7_p20101214-r7.ebuild 1211 BLAKE2B 4d7daeebfd1cfdda4653f238e4675418df22ca0d2f36b1120132e2bd240d7f57f960f0a1286aeb87a99b1f972912a5952a799ac80db6bf82fc891dbdec7c186f SHA512 212b357180e130b726e35011e155b503df108261cc6178defe5779e8bffa14a30c2e00be8f8bb6110f4d5dbd59a27ae012cf20da35874c19eb7b9623ae26562a
 MISC metadata.xml 279 BLAKE2B ed38c142d61f6990bbe12ecd7766fc9e0f1a1577ecbf8eb856d9b235171dbc8ec9a8632c02cfddfe6c587ed3144a417161d00e7818400f56758d4b08289e51d1 SHA512 f20b66bb26c85e5b3c2ecc1a29c136979ee430b88858c79cc673583301f7d3df9aa41dd3c18f432a1580dd5549431e9e7b6e7359f24b6f56f8e20f9bd7f478fa
diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild
index f370745a1ef8..a9fa3f8c207a 100644
--- a/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="gnutls sasl"
 
 RDEPEND="