gentoo auto-resync : 24:12:2024 - 06:30:57

5 files changed, 28 insertions, 432 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 091926d1a5dc..88a7a8299543 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -3,27 +3,22 @@ AUX botan-2.19.5-cloudflare.patch 3012 BLAKE2B 066cd7a5d1e384ebd0596e2af0f00f98c
 AUX botan-2.19.5-no-distutils.patch 2597 BLAKE2B 5d2cf7e89939abdbf97cb01f6364809782c504c22a613b0fb0fdd112beda35b7f824fb9756a5782b55de775926c4447f3cbf5cc2803844acdd115e6ac1db8cce SHA512 171400cffbefb1d6a50bd0cd134083c6e63efd439a9f0129152637dcc4d3ec00d06494e6d8d3a526a71198a2f3e3a87951e23bcf8f647b3e9e7e3e59c9370c98
 AUX botan-3.2.0-ninja.patch 575 BLAKE2B f75eb0a16fadfae6e0a1bb554262d8d902152c054fd97c19a1c4eda31a780138efd42ce05992896d16d98415c555a7cfa01b6dfa201c7e97ad971deab851e7b7 SHA512 ff9078ae1a43404680cf757da15bd17541f51f8de02a1a8d02f075676a1e35ff9a78adba0f3b84847634bc4904ed7b5824df6c708785865a4d01d4f9139e617b
 AUX botan-3.6.1-boost-1.87.patch 14585 BLAKE2B 175d0a7e0bd16fb1e8f1d2493ad41e6633ec32284704cfb182892acf35695adb38f142ebf557697a422b40b11a0b7842f9852b45022168ffa691ddd84f8334a3 SHA512 f4adea3772b7bff4304c3189f3be38c75c2a3ddcfeb451f7578e2f0e1487e2d1eedef0c7dd782a699cf966931a7ab32f0ca4079d9145b7c43495a6281bf68bea
+AUX botan-3.6.1-no-avx2.patch 725 BLAKE2B c6f745d414259a9b4303985c99bb70a87d5d96c24deeba543803219d3ab5cf91f890da9547a79ffba7db11d2ef5f4e77e6c1cad0ed2df6c6241702b6ff3f4c93 SHA512 2b16cb0b21b2240124a1dc3759a5d9dc3597f78a1ba36124c27279aa38c38f5806fba01cbfa0b575bf6d270f3263964a634b7e86b70933233d78ad3773e84014
 AUX botan-3.6.1-tests-glibcxx_assertions.patch 1989 BLAKE2B 21ecc6ac95f228c648da3b14927392378691078a67a2aeebaac18895646c03d531bf98342f6a10d40ae5eefbe5e65b565cb62ea860f70a8875673a21164d36d5 SHA512 41a8fcb9a7c865aceb70393f0ccbf5ac8bd7387cd6ec99e4806dbe02a6b90ddb016914bc6f14a5ae742c4989bfd68a0e28ec36b06cc1cb065a27aa62c0cced0d
 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-2.19.4.tar.xz 6099528 BLAKE2B c35dfec5aad13c76fe09b33f97a72d15f84bfd6c434cae89be13c3fd3e6f7deaa9ea21474890bb6a1f4fa7d23369c32b9fc747862233eac33c8c88dbc912d31f SHA512 2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8
-DIST Botan-2.19.4.tar.xz.asc 488 BLAKE2B b8b7db32d61859778c0866e782ed94ef89ba48a0f0f2289d9452fe7f540ae37ad495cb7eede68199d9bed8e23f695e1860c0d379cd4c35c92de8c45db167b68a SHA512 e00c4e2944655919507300650d81fbee03dd22d1a84cb8135848ea9ee061ca4d4dfada618643193143c0123e56f22e4a6d3a26c73923d872754d80dc2a4779c5
 DIST Botan-2.19.5.tar.xz 6140148 BLAKE2B ab3a133a84c1beb2efd32fcb1746c13ec58cf24cf28cea43c93e9dd4b45c65a47225ff92139e34e1470cf150f839794e3bbd316df5e72a060f11d03141002b79 SHA512 323930fbabd833a6affd71f90835e4ca31a9632e346dee9c5f396aca898697d0f2993b860f739d02cdf49fa7fbb3a2d306c4790e5d5f39620b2dea284983669c
 DIST Botan-2.19.5.tar.xz.asc 488 BLAKE2B 7d52f66f7495ccc249a58ec30206234a9ea4420bcc6e6412593a975bec1173afe55bbcd2c0cbe3859a3fdf547464d3d2949bc03dcb9dbd25c4d5c97589f48202 SHA512 3ba185cf077c109d183fff14270fa60c7be01fd87077e233e6473365111ba83d41448db6d5b5849fe1194c47e84cc2da91a0f75c30ea43538772f13138e472fa
 DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795
 DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744 SHA512 f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9
 DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b510ea8ad19a5286d46d3a8e37e13746d2d4751eb16a70fdc8371b4435b030ef0a17f1ab6dcd76bd81bb3a4fa SHA512 526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9
 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756
-DIST Botan-3.3.0.tar.xz 7164024 BLAKE2B 051a24c28e6858fdff2af15d01a871ebe5bab11d773be821c0a56a55c725c91cf3119280195ac736f4df83305c1d4910430e6b26deded0d4c634e5c2fc23b389 SHA512 90930add225a2b4376046b3ed0177c71e7d19e983fb2b99c40751de5e6c3959b520eaa1e836782eb02ebc8aff8e9a4fd928f585de5e6b1798a8ad4aa0464f19b
-DIST Botan-3.3.0.tar.xz.asc 488 BLAKE2B 043538ff2572a449d4d9ad4bba6d7cab78865e924f712d1b4d4aad9f378cc417f07c19a25adefa22b6e1c06259a50880414c11ce8d3ad1e7f815cf458dbbe6b8 SHA512 c951079c22665966b96cf18c20df7b709353b42dab4aeb33d021b4a8abbc0f06d8fe909f1a5db3e736b4f93b17374d8f832f7aa9f25757a5d5ab1604320581b2
 DIST Botan-3.6.1.tar.xz 7581864 BLAKE2B 744eed158e021d26b9414b3a098e017e6e2c2160fc7fb6a0f24f6cbbb4b08501157108dedd7a71fc3645e27c86608a9ba5d18a11087adfd1c9b174ca3ce85b30 SHA512 06327c55bee5e0d2e142f81b997dd8a1ef98f61ef920b57f6eb4e80ebf6b3de1c62373b889d4a32e62509495792e0b46d5dcc82a6446266974b4d4ead8d9f287
 DIST Botan-3.6.1.tar.xz.asc 488 BLAKE2B 3538c941f707a182f86226dfdbb8222570671e0bce3ca61137a5d978c2b1f5e658ffc1168d7e73a1861210adfac8aa661124c9cbc4950973f7b1e2c3360aab90 SHA512 871c6d91368d8a080e704afb53b1339c6d06aa57aaa45f260bccf1cb1ed31c635587ba930f954ab55668a7ca13b89b2f2acba3c0f1723e3f7190c6ebe9dc2e0b
 EBUILD botan-2.19.3-r2.ebuild 5084 BLAKE2B 4e38d5f419f00e83691cc0eabf70679ef9c2b3ca6583de89bdd629ff047b7ed2fb42e8a577b4352bd5702925de8df0c4c1694562d2fa7b37a3599e13af276da9 SHA512 018dc521bc66d71373865307debdf1bd556b8c663fde27a8e2abb1ab96ce783851024255d8059b0c0146f6ea33d8c43469e77d07996bf3c4ccc7b69a90c0c65a
-EBUILD botan-2.19.4.ebuild 5158 BLAKE2B 851298f127c510589a3f1a19fef3485318e8ec7bc90f197101cc8d0950cfd935b9f8299d8994135d1d1c6790da5ef5d9492322d6ec2f193b50f7ef6dcd20b05e SHA512 1f3c042a943b5e51d2c10d62ea96e6772457423667f8803ea39e8443f74641be99893eb0015f179c2a9a0440d1a8fccf81134eb963fae5d03ec289ad5a032a4d
 EBUILD botan-2.19.5.ebuild 5228 BLAKE2B 4c058bdca20c9c31ad2287d71686820d211011228183c0ee448b9ee41132d1593e29a950f436c58b3a0bbb360eeccb6673f0b2b2a4210988249d1da4290afbc5 SHA512 79981d9c133f0df7c5bbf494d8eca30c47295ab44759eb60f567978a879ecdd3ed3c7537b968a7c5a933b3ed794d34b3c9102d435bf3b950a3784ce5ed153e8c
 EBUILD botan-3.1.1.ebuild 5687 BLAKE2B 2a54f03f4c60f34a426306a440c961d8c670d353dc309eece4b89c251e280a3025faf8c46d76b5f3c2778678fb5302bffa4d13192b7c49b83ff2c4830bd53cf9 SHA512 039403784b9e5314fbf44491a075337e82b88a872965d9c4ec230c9e62b72d2758fb22c0270232faaf07c6de85bc6c9476986f5a264b5253cdb147f8d6c0fd09
 EBUILD botan-3.2.0-r1.ebuild 5949 BLAKE2B d3896126f123289ba540718729e96b72fb5c40527be15fe3b7921040210014efdb65748c4dc601130949bf48fced3864f746915ee9ada72f77d85120fbf85a10 SHA512 623175e58b1b045757ff939c05b1cc55357e0d32b76485027ab45179adc5278eb01f46bac5b944ebbb00e0fcb6963da4ae7202721546c306dc0355e7bb747161
 EBUILD botan-3.2.0-r2.ebuild 5974 BLAKE2B 0d13e2fd6b89cd5cd4254b0d4d109ce1df29f7e191df73c453786db9e2c134fc79a7faa592147c0bd780e1ea2e0d0c230b51402e028ea1b45f6fa188e20cd8a5 SHA512 d1ec5f53985ddcd8ef65439385a9fa4b33be4686e8fbcedf1c7c3b15eeb74dc635bf46bbba39195e6a5487297ac71e68b9442c129ab36d92c60b8d366dfde1f3
-EBUILD botan-3.3.0.ebuild 6000 BLAKE2B 536ec0d6f2b6d832bcd2bfe5a8ecc9f1656ec644fb023dafd0592a5b1492b13fdb9ee75d5c9a6589b822a3882aec19ca35dc737766d4cd073cac7357e1225acb SHA512 179a8f6c557b4d797bb2508d409c0bfff23d35b7d46cc398a888f7f0a6a4e05049800f0dfc62505b7b1448b92a81c3b53001645dd4fd0395848b79336f268009
-EBUILD botan-3.6.1.ebuild 6028 BLAKE2B 7d0f1b20d19aa9a621884c68ff8bfd3b03490fa73c419e500f671fb569ffecd5b87c2872a7c32833886a6801563b2ddfa2f240c2e5241b4010d9f6395504080e SHA512 b3bc760fe23468bd88abe86b8ffbc1bc45a24dc5ad09cf3e5bf12cb2cc22115743e84c49e6c0e870f68a235ac79cce391a1f8ca2d13d937e1da3b139ff899592
+EBUILD botan-3.6.1.ebuild 6069 BLAKE2B cf5672fe7c34d288ad52702625eacaa7ee702b1762849114cf271a973a34f5fc4fdd61625e987e0a7904476f96be4f4040dead03e3cfccd58b241357540508a7 SHA512 3f3aca4dca31a801d6ddb70fea5395f6755a54c9ac9e112c597064f0c458437d58c668313ab1c1c0ab104668369bc0c329ec5b223ed612c704a90602a4994d1b
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-2.19.4.ebuild b/dev-libs/botan/botan-2.19.4.ebuild
deleted file mode 100644
index b35aa44c46b2..000000000000
--- a/dev-libs/botan/botan-2.19.4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc
-inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig
-
-MY_P="Botan-${PV}"
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-# New major versions are parallel-installable
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version
-# Unkeyworded because of https://github.com/randombit/botan/issues/3916
-#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
-IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
-CPU_USE=(
-	cpu_flags_arm_{aes,neon}
-	cpu_flags_ppc_altivec
-	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2}
-)
-IUSE+=" ${CPU_USE[@]}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( dev-libs/boost:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/botan-3.0.0-r1:3[tools]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-	verify-sig? ( sec-keys/openpgp-keys-botan )
-"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	python_setup
-
-	local disable_modules=(
-		$(usev !boost 'boost')
-	)
-
-	if [[ -z "${DISABLE_MODULES}" ]] ; then
-		elog "Disabling module(s): ${disable_modules[@]}"
-	fi
-
-	local chostarch="${CHOST%%-*}"
-
-	# Arch specific wrangling
-	local myos=
-	case ${CHOST} in
-		*-darwin*)
-			myos=darwin
-			;;
-		*)
-			myos=linux
-
-			if [[ ${CHOST} == *hppa* ]] ; then
-				chostarch=parisc
-			elif [[ ${ABI} == sparc64 ]] ; then
-				chostarch="sparc64"
-			elif [[ ${ABI} == sparc32 ]] ; then
-				chostarch="sparc32"
-			fi
-			;;
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	local myargs=(
-		# Intrinsics
-		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
-		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
-		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
-		$(usev !cpu_flags_arm_neon '--disable-neon')
-		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
-		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
-		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
-		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
-		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
-		$(usev !cpu_flags_x86_sha '--disable-sha-ni')
-		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
-		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
-		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
-		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
-
-		# HPPA's GCC doesn't support SSP
-		$(usev hppa '--without-stack-protector')
-
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_enable static-libs static-library)
-		$(use_with sqlite sqlite3)
-		$(use_with zlib)
-
-		--cpu=${chostarch}
-		--docdir=share/doc
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
-		--distribution-info="Gentoo ${PVR}"
-		--libdir="$(get_libdir)"
-		# Avoid collisions between slots for tools (bug #905700)
-		--program-suffix=$(ver_cut 1)
-
-		# Don't install Python bindings automatically
-		# (do it manually later in the right place)
-		# bug #723096
-		--no-install-python-module
-
-		--os=${myos}
-		--prefix="${EPREFIX}"/usr
-		--with-endian="$(tc-endian)"
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}")
-	)
-
-	local build_targets=(
-		shared
-		$(usev static-libs static)
-		$(usev tools cli)
-		$(usev test tests)
-	)
-
-	myargs+=(
-		--build-targets=$(IFS=","; echo "${build_targets[*]}")
-	)
-
-	if use elibc_glibc && use kernel_linux ; then
-		myargs+=(
-			--with-os-features=getrandom,getentropy
-		)
-	fi
-
-	tc-export AR CC CXX
-
-	local sanitizers=()
-	if is-flagq -fsanitize=address ; then
-		sanitizers+=( address )
-	fi
-	if is-flagq -fsanitize=undefined ; then
-		sanitizers+=( undefined )
-	fi
-	filter-flags '-fsanitize=*'
-	myargs+=(
-		--enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}")
-	)
-
-	edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)"
-}
-
-src_install() {
-	default
-
-	if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then
-		# --docdir in configure controls the parent directory unfortunately
-		mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
-	fi
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py
-	fi
-}
diff --git a/dev-libs/botan/botan-3.3.0.ebuild b/dev-libs/botan/botan-3.3.0.ebuild
deleted file mode 100644
index 6c28d228cd2a..000000000000
--- a/dev-libs/botan/botan-3.3.0.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc
-inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig
-
-MY_P="Botan-${PV}"
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-# New major versions are parallel-installable
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version
-# Unkeyworded because of https://github.com/randombit/botan/issues/3917
-#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
-IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
-CPU_USE=(
-	cpu_flags_arm_{aes,neon,sha1,sha2}
-	cpu_flags_ppc_altivec
-	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2}
-)
-IUSE+=" ${CPU_USE[@]}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( dev-libs/boost:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/botan-2.19.3-r1:2[tools]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	${NINJA_DEPEND}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-	|| ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* )
-	verify-sig? ( sec-keys/openpgp-keys-botan )
-"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# bug #908958
-	if tc-is-gcc && ver_test $(gcc-version) -lt 11 ; then
-		eerror "Botan needs >=gcc-11 or >=clang-14 to compile."
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Botan!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then
-		eerror "Botan needs >=gcc-11 or >=clang-14 to compile."
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Botan!"
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX
-	python_setup
-
-	local disable_modules=(
-		$(usev !boost 'boost')
-	)
-
-	if [[ -z "${DISABLE_MODULES}" ]] ; then
-		elog "Disabling module(s): ${disable_modules[@]}"
-	fi
-
-	local chostarch="${CHOST%%-*}"
-
-	# Arch specific wrangling
-	local myos=
-	case ${CHOST} in
-		*-darwin*)
-			myos=darwin
-			;;
-		*)
-			myos=linux
-
-			if [[ ${CHOST} == *hppa* ]] ; then
-				chostarch=parisc
-			elif [[ ${ABI} == sparc64 ]] ; then
-				chostarch="sparc64"
-			elif [[ ${ABI} == sparc32 ]] ; then
-				chostarch="sparc32"
-			fi
-			;;
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	local myargs=(
-		# Intrinsics
-		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
-		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
-		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
-		$(usev !cpu_flags_arm_neon '--disable-neon')
-		$(usev !cpu_flags_arm_sha1 '--disable-armv8crypto')
-		$(usev !cpu_flags_arm_sha2 '--disable-armv8crypto')
-		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
-		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
-		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
-		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
-		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
-		$(usev !cpu_flags_x86_sha '--disable-sha-ni')
-		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
-		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
-		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
-		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
-
-		# HPPA's GCC doesn't support SSP
-		$(usev hppa '--without-stack-protector')
-
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_enable static-libs static-library)
-		$(use_with sqlite sqlite3)
-		$(use_with zlib)
-
-		--build-tool=ninja
-		--cpu=${chostarch}
-		--docdir=share/doc
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
-		--distribution-info="Gentoo ${PVR}"
-		--libdir="$(get_libdir)"
-		# Avoid collisions between slots for tools (bug #905700)
-		--program-suffix=$(ver_cut 1)
-
-		# Don't install Python bindings automatically
-		# (do it manually later in the right place)
-		# bug #723096
-		--no-install-python-module
-
-		--os=${myos}
-		--prefix="${EPREFIX}"/usr
-		--with-endian="$(tc-endian)"
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}")
-	)
-
-	local build_targets=(
-		shared
-		$(usev static-libs static)
-		$(usev tools cli)
-		$(usev test tests)
-	)
-
-	myargs+=(
-		--build-targets=$(IFS=","; echo "${build_targets[*]}")
-	)
-
-	if ( use elibc_glibc || use elibc_musl ) && use kernel_linux ; then
-		myargs+=(
-			--with-os-features=getrandom,getentropy
-		)
-	fi
-
-	local sanitizers=()
-	if is-flagq -fsanitize=address ; then
-		sanitizers+=( address )
-	fi
-	if is-flagq -fsanitize=undefined ; then
-		sanitizers+=( undefined )
-	fi
-	filter-flags '-fsanitize=*'
-	myargs+=(
-		--enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}")
-	)
-
-	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() {
-	DESTDIR="${D}" eninja install
-
-	if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then
-		# --docdir in configure controls the parent directory unfortunately
-		mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
-	fi
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py
-	fi
-}
diff --git a/dev-libs/botan/botan-3.6.1.ebuild b/dev-libs/botan/botan-3.6.1.ebuild
index e47afaa7b00d..7488dcffd9ec 100644
--- a/dev-libs/botan/botan-3.6.1.ebuild
+++ b/dev-libs/botan/botan-3.6.1.ebuild
@@ -58,6 +58,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.87.patch
 	"${FILESDIR}"/${P}-tests-glibcxx_assertions.patch
+	"${FILESDIR}"/${PN}-3.6.1-no-avx2.patch
 )
 
 python_check_deps() {
diff --git a/dev-libs/botan/files/botan-3.6.1-no-avx2.patch b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch
new file mode 100644
index 000000000000..a4794738d6cd
--- /dev/null
+++ b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/946821
+https://github.com/randombit/botan/issues/4493
+https://github.com/randombit/botan/pull/4494
+
+From c7f8f6c0967faac1ba66ca3d55560b2aed12863a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com>
+Date: Mon, 23 Dec 2024 09:29:07 +0100
+Subject: [PATCH] FIX: SM4 GFNI needs AVX2
+
+closes #4493
+---
+ src/lib/block/sm4/sm4_gfni/info.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/block/sm4/sm4_gfni/info.txt b/src/lib/block/sm4/sm4_gfni/info.txt
+index 4c5867f9b72..5b5c87b42e7 100644
+--- a/src/lib/block/sm4/sm4_gfni/info.txt
++++ b/src/lib/block/sm4/sm4_gfni/info.txt
+@@ -9,4 +9,5 @@ brief -> "SM4 using Intel GFNI"
+ 
+ <isa>
+ gfni
++avx2
+ </isa>
+