gentoo auto-resync : 10:11:2024 - 03:03:09

4 files changed, 44 insertions, 2 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-r1.ebuild
index 5a5199ac853f..cb81c3d6e77f 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-r1.ebuild
@@ -112,6 +112,8 @@ PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
+RUST_MAX_VER="1.77.1"
+
 inherit autotools cargo distutils-r1 readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="389 Directory Server (core libraries and daemons)"
@@ -166,7 +168,6 @@ DEPEND="
 
 BDEPEND=">=dev-build/autoconf-2.69-r5
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/argparse-manpage[${PYTHON_USEDEP}]
@@ -202,10 +203,16 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-db-gentoo.patch"
+	"${FILESDIR}/${PN}-3.0.2-fix-rust-in-configure.patch"
 )
 
 distutils_enable_tests pytest
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_prepare() {
 	# https://github.com/389ds/389-ds-base/issues/4292
 	if use !systemd; then
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 2e86eb9ca41e..510ef438f949 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,3 +1,4 @@
+AUX 389-ds-base-3.0.2-fix-rust-in-configure.patch 1157 BLAKE2B e79081e399ed900ed22c75c975599c6a7ebf7fd1735258b39cc2b4f1c8f3b0a41f5353e260cfe14a10683a53e9dca3f6cf37bfee9ffb1289d83698185a737ce2 SHA512 480a86503a8724a9b68755a4d04c5231f17bcd9bf27e8251ec183a7a2a66b5aca4160afc255cb84e0c5c8a81516bdc100ee5e8e03ee84f052453733c4a87ade4
 AUX 389-ds-base-db-gentoo.patch 838 BLAKE2B 88ba5e7b2868b9e790fd2b326e4ceddbbb5d82f8f598ab8a41c4f1acb79d3796a9e17f20fc9fd282a801e761612bf568947657f46001fd7d3fa76daadac44cfb SHA512 e37a1ca80cbd733e01bd077cb05cc656b725a3f596221946198a34b9e62f231642d5e10b09e40dd02564cab9e01593225b622c70d49b456054f9fcfd762f597d
 AUX 389-ds-base.conf 118 BLAKE2B 48d1ef0410b57658508544aa8826ff8e12a17aaf5de1c1ea3346414d6f16ea3b44d14e300b23b82441ae6272df36089892aabfd027c73a3ce70e6a3c9ec9d358 SHA512 69ed8b8f3bdbf9098088b0c92c41a238f16d14ba9f86ebc2b5debe5f001b4d8e235f7cff4731d72b30b5ac70486b0f4300b99646aa3926a3fa59515a64f16402
 AUX 389-ds-snmp.initd 951 BLAKE2B 5598a35b1368cce330d314e335d8fe624ed318c3363f32e9128968cc23de9f87a253b4790673c7557325a395961490ee4918d9a9d9bce4efd23d616418735aaf SHA512 ce58938ac13efb74e3a70def3a44c267095aae4c2e47e65ff176e9cc7e65f4210af230dc52738b5dcd3d831c9ba97cb030f8e5c5f0eaccb6bc6a1a379383f3a4
@@ -105,5 +106,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 7769 BLAKE2B e925ec32f7878a8180dbf2bbbc4ceb8f54ec813cfb9c088577eb35d76fe660b36272107f4382bb109666788fbb91005dcc55d3a6beff47b4b49d1edf5744df4c SHA512 ddf6ddea05fe21eb19374ff648285dd323fa2a5027b5120e2d6b841a5d95affdc1f2155d208ef3bcdba02db985b182df9c773f8ea15fac55f46dc51a7fc07c06
+EBUILD 389-ds-base-3.0.2-r1.ebuild 7887 BLAKE2B 8f3106c7193af203e9a7fe94c89ecbd6cb68d64d35cb770311ac3a1e9d54f9b635dc21f16f754d8b833fe7f1156834a66b76ba620cfe5c0bde584a9a4658c950 SHA512 0c6a3d8b6a7063582f5590af39ade1a28ee30972584e47c416de70fc15fe07e25d453d75093a657b1e4ab8f1182f10f3fa8e7609e68e2a3dbedf76df90104219
 MISC metadata.xml 1582 BLAKE2B b29c4633cc0264cfc762327d8b24f21abed6a0e7b92d093d46826945f500d73898a488003d00a4c1fd2feef469a095ef3fc3d55c710f1c6543fb469e088ce2fd SHA512 6413a53a8494cb491bfdabfb4f097f657f86163e33e60ea0c7c1f02079a44d2e487ab2fd72a15f0e34d66ce840d52f058212b97213e45f50069d333a910dc83f
diff --git a/net-nds/389-ds-base/files/389-ds-base-3.0.2-fix-rust-in-configure.patch b/net-nds/389-ds-base/files/389-ds-base-3.0.2-fix-rust-in-configure.patch
new file mode 100644
index 000000000000..fef1496e52af
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-base-3.0.2-fix-rust-in-configure.patch
@@ -0,0 +1,34 @@
+From 28d4871c5844b41d63a5cbc093b4453c98d5427e Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Thu, 7 Nov 2024 20:08:44 +1000
+Subject: [PATCH] Fix rust in configure
+
+RUSTC and CARGO are standard variables that are often used to indicate
+the desired implementation to build systems.
+
+Prefix existing usage of these variables with `HAS_` so that this
+does not just break
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,10 +95,10 @@ AS_IF([test "$enable_rust_offline" = yes],
+     [rust_vendor_sources=""])
+ AC_SUBST([rust_vendor_sources])
+ if test "$enable_rust_offline" = yes; then
+-    AC_CHECK_PROG(CARGO, [cargo], [yes], [no])
+-    AC_CHECK_PROG(RUSTC, [rustc], [yes], [no])
++    AC_CHECK_PROG(HAS_CARGO, [cargo], [yes], [no])
++    AC_CHECK_PROG(HAS_RUSTC, [rustc], [yes], [no])
+ 
+-    AS_IF([test "$CARGO" != "yes" -o "$RUSTC" != "yes"], [
++    AS_IF([test "$HAS_CARGO" != "yes" -o "$HAS_RUSTC" != "yes"], [
+       AC_MSG_FAILURE("Rust based plugins cannot be built cargo=$CARGO rustc=$RUSTC")
+     ])
+ fi
+@@ -944,4 +944,3 @@ AC_CONFIG_FILES([Makefile rpm/389-ds-base.spec  ])
+ AC_CONFIG_FILES([.cargo/config])
+ 
+ AC_OUTPUT
+-
+-- 
+2.47.0
+
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index ea6458b4c65f..12d28cdfded6 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz