gentoo auto-resync : 12:10:2023 - 12:14:42

3 files changed, 33 insertions, 5 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 4c653c55f9a1..9cb31c2fa825 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,4 @@
+AUX botan-3.2.0-ninja.patch 575 BLAKE2B f75eb0a16fadfae6e0a1bb554262d8d902152c054fd97c19a1c4eda31a780138efd42ce05992896d16d98415c555a7cfa01b6dfa201c7e97ad971deab851e7b7 SHA512 ff9078ae1a43404680cf757da15bd17541f51f8de02a1a8d02f075676a1e35ff9a78adba0f3b84847634bc4904ed7b5824df6c708785865a4d01d4f9139e617b
 DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110
 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23
 DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795
@@ -6,5 +7,5 @@ DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b
 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756
 EBUILD botan-2.19.3-r2.ebuild 4822 BLAKE2B 78f05a4a8832e5eee611da509d40243c57f39e41e39119d07647f94843689052583867c3150fce437cd322369ad6e0d5e0ab03ab7ec19300fb961b269db0e2a1 SHA512 4c0e0eb0e35285af725816edd2c414cf054d7dd06aab9b1c550d70fa892fe603c2e6c20283ee964e1c53a35b87e5177c74c8b4ace5aaa661bc24c73eb72935be
 EBUILD botan-3.1.1.ebuild 5703 BLAKE2B ea6b59cfa80842a3dd9364bba6118439880d9731fb00afaeb28d78d95d0d23e9b067ac70b93fc55b834c7eb7665930c1c0809d15b0e62a18ad55cda5e32f03bf SHA512 7636b43a92eaaaadd17dc641af79ff689014e9654ebb083ffbc8f8ef1493332f0da604ffccb39d0e0ecfa19c721e0750463e9a432ef3e34a5d60a34ae089804e
-EBUILD botan-3.2.0.ebuild 5880 BLAKE2B 3c5c326ff89360f50b6c73a0b09100961ced57292c40f9e18f216b18a1bbb3b3733ca0351b99900433758f9bc421d43d45882a4ad4102bf693dc8074cc9a9496 SHA512 f71ecc158473e11bd125fb7681f196a5c4170474039002149d6d082b905c10a021468d7b25b5979c331ea2ff4853dd254aa2edea8e3995ab7a9686966199cc4a
+EBUILD botan-3.2.0-r1.ebuild 5968 BLAKE2B 01d9334b1e15c10af0f3796350f32f7a52fd9d5f99fc07df7ece805eda6114ec2d08ee7905ef6e93f8986215dbba56837bf6ba1a3f1735ea96bfe77a649e28ac SHA512 cc2835648518ce325c64f6898c536eb8ba0ac201e3413293a6c34d6400d6edb314cd5674db8bb26b6287a7e697faadf8e87f0685074a2775d53f414eb4ca7353
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-3.2.0.ebuild b/dev-libs/botan/botan-3.2.0-r1.ebuild
index bb651261749f..bd7375f6945b 100644
--- a/dev-libs/botan/botan-3.2.0.ebuild
+++ b/dev-libs/botan/botan-3.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
-inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig
+inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig
 
 MY_P="Botan-${PV}"
 DESCRIPTION="C++ crypto library"
@@ -46,6 +46,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	${NINJA_DEPEND}
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
@@ -56,6 +57,9 @@ BDEPEND="
 # NOTE: Considering patching Botan?
 # Please see upstream's guidance:
 # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+PATCHES=(
+	"${FILESDIR}"/${P}-ninja.patch
+)
 
 python_check_deps() {
 	use doc || return 0
@@ -150,8 +154,7 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 		$(use_with zlib)
 
-		# Broken in 3.2.0, bug #915544
-		#--build-tool=ninja
+		--build-tool=ninja
 		--cpu=${chostarch}
 		--docdir=share/doc
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
@@ -203,12 +206,16 @@ src_configure() {
 	edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
 }
 
+src_compile() {
+	eninja
+}
+
 src_test() {
 	LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)"
 }
 
 src_install() {
-	default
+	DESTDIR="${D}" eninja install
 
 	if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then
 		# --docdir in configure controls the parent directory unfortunately
diff --git a/dev-libs/botan/files/botan-3.2.0-ninja.patch b/dev-libs/botan/files/botan-3.2.0-ninja.patch
new file mode 100644
index 000000000000..826fc496fb31
--- /dev/null
+++ b/dev-libs/botan/files/botan-3.2.0-ninja.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/915544
+https://github.com/randombit/botan/commit/a1a32558669a6751e39420b26930d477790509ce
+
+From a1a32558669a6751e39420b26930d477790509ce Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Wed, 11 Oct 2023 07:36:31 -0400
+Subject: [PATCH] Fix Ninja build to pass instruction set flags to the compiler
+
+Fixes #3750
+--- a/src/build-data/ninja.in
++++ b/src/build-data/ninja.in
+@@ -161,6 +161,7 @@ build tidy: tidy
+ 
+ %{for lib_build_info}
+ build %{obj}: compile_lib %{src}
++  isa_flags = %{isa_flags}
+ %{endfor}
+ 
+ %{for cli_build_info}
+