gentoo auto-resync : 14:07:2023 - 16:37:36

2 files changed, 19 insertions, 3 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 410b7f2c3e0c..6d2ddd322375 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,10 +5,10 @@ DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd919
 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23
 DIST Botan-3.0.0.tar.xz 8752380 BLAKE2B 06ac29dc0cbaef43a38cc30185f431e1b1f4083469fdea19ee5d77ada6633022746b8ae2419bd00872f9b3892af9c61a455bc88f77bef84f451938dffd27bde3 SHA512 d67ac0f9d67f6869b7a35d4a7c5e96ffcc619f7e44ead36b4cd0906f3d925d12181566aace03ac719ef54d819ae1158febc0b25839beed5f92eade06d510b594
 DIST Botan-3.0.0.tar.xz.asc 488 BLAKE2B 6a34817ec4700983151f97d2e278870736860ac72f3936fcc63e241d89ba758bdf7765d3c877d88019055562a6067c278ecbac263e8d87cc310790089e47f662 SHA512 46ff64bb4d215a48b0549d90ae2461ae39ae5ecf588a7e130876759ec30561c5a2db77ee9cdc7a3dab990927b51ea732f5b56592bdc150062ca25690378ab817
-DIST Botan-3.1.0.tar.xz 8807364 BLAKE2B 4f990905d213d42969e54e2f95844832ceecad91eac08436d221a3881719e896e3a4fa564e8b267d5d74d9955b55b547b3df9ca77726993a9a8136e42add4533 SHA512 2234f026bc79657699ab53042dca7d67f4beee91593bf12c32a94688978bd4a99ef4e632ecdb2d21b20481e1cdc353a8fa8665db0f0130b2e8f0f84ebeac8970
-DIST Botan-3.1.0.tar.xz.asc 488 BLAKE2B 921092f09ea4e00742c66827298bc5b1476dbb98c5c76fd10a09013333b0d9522484eb85cffef359ffc952c9d01892295c125b7c8957fa028cad2a931b599e05 SHA512 11f43d6147113fbe4d49d81b5b2f74a99951cee6cb52ebea741c36a7dec577e1fc14af7241dc60c14b271ba1432dc19a59939b3984233738159198d187973e3e
+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
 EBUILD botan-2.19.2.ebuild 4452 BLAKE2B 6f20db33003277c4705690d5aedb9878ad10d24ae01be837d7c0a1c5276b5a8463197b78c1879560ef45369167abe11ed6d10443427505bddd641a2b9fae5ffc SHA512 5e2ea6890d06e9c7999ecb7103bd79e7052a508d8bc94cabf7154afe9a17616f88ff053086980afa2ecf98b2521a7fed4ddd511e01345ea675d85f3038f80984
 EBUILD botan-2.19.3-r2.ebuild 4822 BLAKE2B 78f05a4a8832e5eee611da509d40243c57f39e41e39119d07647f94843689052583867c3150fce437cd322369ad6e0d5e0ab03ab7ec19300fb961b269db0e2a1 SHA512 4c0e0eb0e35285af725816edd2c414cf054d7dd06aab9b1c550d70fa892fe603c2e6c20283ee964e1c53a35b87e5177c74c8b4ace5aaa661bc24c73eb72935be
 EBUILD botan-3.0.0-r2.ebuild 4881 BLAKE2B bf499274424a18f242b47bdc961dc6a52b49b51cefc1d4ff46848cf7dbc7a7347e16d68056cf405de91c89529ad4ef2357357d26841a29236abeae1cc9b4511a SHA512 5e2e494eed8ffee0ef3f39684a57cccf90c05844558ac9c0fd5da07881866ceb0758bb28effafb4e7ffd87ac4ceee91f9055f53e2e0434b7447837e3e9c1ded2
-EBUILD botan-3.1.0.ebuild 5121 BLAKE2B a60007930ae029b9d47db9870adb56ed0393c7b82a9601e41fc3dc3996245efe3a55d199d8c40461ed316b0d80eb16abd333032a947d491b39551fc8621f11d9 SHA512 713b3e04fd50c167aea1b6d838f4ad000b30311ac46c7c8a54e9452c58e2f5957514561697ab9697260c725220fa9d8690588a1df4b8f732cc1c4fdcac6c5d35
+EBUILD botan-3.1.1.ebuild 5701 BLAKE2B 397597d5b04c4951383050e619afba58ebc38c9d7552f1c4dbe073b29ac1ed556232f7b8d24c6c0e1e567c492c45f6004d43089437f55246b48aca41e26ca26f SHA512 3ef6e7ce5586438f0efcf2d76efeebd89a7c4f798443f2acb9543399cc971cf086c3fe49092e6deabe45c2707e3f374dc1377538bee113a6ab54fc43e8b7944b
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-3.1.0.ebuild b/dev-libs/botan/botan-3.1.1.ebuild
index 6cbda3afca02..43885db0f0cd 100644
--- a/dev-libs/botan/botan-3.1.0.ebuild
+++ b/dev-libs/botan/botan-3.1.1.ebuild
@@ -49,6 +49,7 @@ BDEPEND="
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
+	|| ( >=sys-devel/gcc-11:* >=sys-devel/clang-14:* )
 	verify-sig? ( sec-keys/openpgp-keys-botan )
 "
 
@@ -61,6 +62,21 @@ python_check_deps() {
 	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 sys-devel/clang"
+		die "Clang version is too old to compile Botan!"
+	fi
+}
+
 src_configure() {
 	tc-export AR CC CXX
 	python_setup