gentoo auto-resync : 11:10:2023 - 12:12:04

5 files changed, 10 insertions, 12 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7e4a11de3753..86ea5f3c7c23 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index c925b8b1c264..4c653c55f9a1 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -6,5 +6,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 5806 BLAKE2B a5bed30fd14e09637171ba256da50b9a93721260e734566683cb8fbd5bba3a19615308c3c4a87ab042374092725f93d57499cd42210a8b95c86fb8e066d87b5f SHA512 c88b4eb7ef4f7f70dadd4b25314b5e70979d39da3b40b1268e2a5fee9f91277b3eb42719851a86df3d17a1e1fb4d7e332080d925ddad2ce0613a9b6deabb0de1
+EBUILD botan-3.2.0.ebuild 5880 BLAKE2B 3c5c326ff89360f50b6c73a0b09100961ced57292c40f9e18f216b18a1bbb3b3733ca0351b99900433758f9bc421d43d45882a4ad4102bf693dc8074cc9a9496 SHA512 f71ecc158473e11bd125fb7681f196a5c4170474039002149d6d082b905c10a021468d7b25b5979c331ea2ff4853dd254aa2edea8e3995ab7a9686966199cc4a
 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.ebuild
index 25af4176f0f6..bb651261749f 100644
--- a/dev-libs/botan/botan-3.2.0.ebuild
+++ b/dev-libs/botan/botan-3.2.0.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 ninja-utils python-r1 toolchain-funcs verify-sig
+inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig
 
 MY_P="Botan-${PV}"
 DESCRIPTION="C++ crypto library"
@@ -22,7 +22,7 @@ IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
 RESTRICT="!test? ( test )"
 
 CPU_USE=(
-	cpu_flags_arm_{aes,neon}
+	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}
 )
@@ -46,7 +46,6 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	${NINJA_DEPEND}
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
@@ -126,6 +125,8 @@ src_configure() {
 		# 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')
@@ -149,7 +150,8 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 		$(use_with zlib)
 
-		--build-tool=ninja
+		# Broken in 3.2.0, bug #915544
+		#--build-tool=ninja
 		--cpu=${chostarch}
 		--docdir=share/doc
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
@@ -201,16 +203,12 @@ 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() {
-	DESTDIR="${D}" eninja install
+	default
 
 	if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then
 		# --docdir in configure controls the parent directory unfortunately
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 1dfd336f19eb..0004d656e9b5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -25,7 +25,7 @@ EBUILD openssl-1.0.2u-r1.ebuild 9993 BLAKE2B 2128588b25f90830c4b9120a0e5aa079b12
 EBUILD openssl-1.1.1u.ebuild 8046 BLAKE2B ce0b11e91b2b901675f8651c741207c0f26291a84f4dfc9e8f5916bc5e82415e8bb4dab057e416ef5e4c79f01551c63bff12ca39dc8d36a71abe891334a732fe SHA512 c36ae6f86830ce41b699277faabb662684b4ae70f223a7dad7f925353b1b5190e531dfdcf42d29f4edb6e0b4ea40177c66d8c2c8405111774d9a127431c4742a
 EBUILD openssl-1.1.1w.ebuild 8054 BLAKE2B 20c1fed9799369fde0813ba1be90353ffb4983eb5235125cf1871d6b3849b6cc8f50f146e0987d1e6e5c9500416b66aee7908a2ea78dbc11b14b534e994d3274 SHA512 4639f887eb41fa838e7c4f623e599bbffdc0cb003860c97ee3755f89b07d6c032d1ff4ab457427829eef79dfc8675d0843f5aeffc0e07f28c9690e4f06566a8a
 EBUILD openssl-3.0.10.ebuild 8528 BLAKE2B a4195c916d91f1074946899c35e07f064f56e74f2de05b47681a3e4f7568a5cb485d34f229afb7c715927952c70ed069561ece17a654a309e21f5b8d6d29f77f SHA512 9d760d8249e935e47d66d8336c494edd2cbbf0166703bfd98952592f40bcc6616340ae43eb874b2241b36dd07ab695f6f386c8065c429b6abb2ec63743044c46
-EBUILD openssl-3.0.11.ebuild 8536 BLAKE2B 72b03f892402785131ef8e4e65ce706e4b4de764ccc05034b77ded23f320dbc260e408793b90268e3b02330bf18b355dad2866e8f09ade59b039a1a943024ed9 SHA512 caeede0e828d3f4ad00d86c7a117b691c19edd8c91b1ffd2ffb10ec034cf8cdd1670842319203e30c672ffd1d0dfc0ba1a8f39055edacfa7829196870735c32c
+EBUILD openssl-3.0.11.ebuild 8530 BLAKE2B 9b5238a4c236116efc398068851c3adacc50aa4e8074070bffd2af8ea6d2e5191a75a06a0dc2179fe816fb30a8e05aed1a66d10cf3e7bbe7b1ec743938d9d5c4 SHA512 141d81e4f23baffb4f1eef896f7743186c613d697588b5850ae1d0076a716d1aadaa11ee4473b4bcc213f4efd6eeee51ed25232ece4429e5c8f40cd03fab7ff8
 EBUILD openssl-3.0.9-r1.ebuild 8493 BLAKE2B 851fac7d928f0f9cde96ac4a3fa1cd6002e501ee8070def2869cb68280c70bb9e393a9edae4391a1a3e0649d8fdc8066c46eedfbe0c7ec028b2a312798f368ba SHA512 579257ff9e960c42f91f407ced21cd44eef33f171e7e9d726a4e8b3d6e7f46e2afdd94edbd6d0514dac1927d660abef180d68126b3c26a0ff05df6ecdc65ac72
 EBUILD openssl-3.0.9-r2.ebuild 8586 BLAKE2B 958142587d7f69df7ba8d6cb4ae36537e51b5edad32156141587b4367ae0e49c00f797b80ffc0731901dedeaf211a4c5282712e86fb25e0ebc590d791139acc4 SHA512 c2c1840cc0fe24a49ecf206fd3e37c28e8654d205092d4d6232164d908349d8f52955781918da2560fa9ce8c73f0371cca8def0915f21c064199eb8a8f8872ba
 EBUILD openssl-3.1.2.ebuild 8582 BLAKE2B 1ce521d304575b61b85ceb8a416f393bbea1d2d254d055a3820c3b61d829a6f51617d381ed9ab12651fe96fe432ad10575f2ba2d48c3f40546cb7ac4c974d791 SHA512 1693b8566af7ff16543188af28fbb86ddf4f274ea6f9e5d787e7e02afe1a3561c4801a2012de46d2c5a3bc48f655f65d6550553fb9582d4e60cc6667a7b9deb3
diff --git a/dev-libs/openssl/openssl-3.0.11.ebuild b/dev-libs/openssl/openssl-3.0.11.ebuild
index 9d573d00feeb..2dfb4cb25c67 100644
--- a/dev-libs/openssl/openssl-3.0.11.ebuild
+++ b/dev-libs/openssl/openssl-3.0.11.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}