gentoo auto-resync : 25:06:2024 - 00:12:20

3 files changed, 28 insertions, 11 deletions

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 83c446f407da..2f5ba553c86a 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,10 +1,10 @@
+DIST nettle-3.10.tar.gz 2640485 BLAKE2B edf0ba6375f06e2dd4b1e3ed4bab5f592ac04a36f748ce0461bbec32622eb3d5f96f89350926c24b5bbbf37dbe14a1ad64bba5df7cb7ad5987ec634573aabbb5 SHA512 18d5b904ce60514aa81b57bff2945e5f7f4366d4775e6a5ffc227b85be2def72b3d2159b983b75ac95a56d3167a2ef1a25b5dfc2fb6193f16a012935c36a7b34
+DIST nettle-3.10.tar.gz.sig 374 BLAKE2B 9edebae1bc1941dfc19c3c3653f80ebf66e8aed974c99673a294ff6835145ca8265f5466829e27c5d0352e88a73e9a58fb017cdbad678705ae29cd27dd80fefe SHA512 a56d46bfd545b0dff47ee6426e019afea024ebf40698018b8a4b7a25168ce615bbfe773894dc01ab246f7010ef6a7f1c248cf1f9c693f0f0dbaf27c33c7d216f
 DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a
 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
 DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced
 DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d
-DIST nettle-3.9.tar.gz 2393838 BLAKE2B 80885fa380de58765155a5d4b209e524f4bd0336156ba6f5189702007438998094df0e4e801370fd0a74251b8cf91f46638b0c0139388c2c2098b1207ed3415c SHA512 5e44f59b37ec1e92345fce0b963151d1f2aabf01b3a197b8d931067c51af4ba025059c6a07f2bcd19b17eb49d6ede98f5c200e58d340959826cda473459d2fba
-DIST nettle-3.9.tar.gz.sig 374 BLAKE2B 4fb9fbdafd01712db2506e070a64b6821dcc0c3ff3cea83011662ee4cdd5120ed10c6fa7b41d556069fe2d8827a312e94bb3586be845284fa7a7ac75f000a750 SHA512 8cf060e9f8e0dc0a70a7d324cf2366e0fc990fca2d8a1c677e66382f6853f96146fe30ea9b8629030991f4799430c7660ae7867c94167760bb945abb526b5bda
+EBUILD nettle-3.10.ebuild 3295 BLAKE2B c0fd90d2b496227a53431fdc93ff1bdec98e6c3a726d042097abdcd650c3538eef05cd0da0ee927a8bd2ac72a148bb118b72abe0d066a127df9d1fb05ab28bab SHA512 3d5888cd83ee6116a12cbe9d6a015eb9fad7319990a716988dc17cdd83619554db0f294ff6eda298efa4ea75df4e2df0e3e52f509df24078828152f02bf236d2
 EBUILD nettle-3.8.1.ebuild 2623 BLAKE2B 60ea85fbaedf21cb3c7a056d08eb46eb1ce1e487e5ef5c69f2e0baef1d312cd514580a48e6f5b0b99b9762e2f9cc01e82dc8ef5d30aabe4b00c1f60313fc93b5 SHA512 3c6ded7aa546c6436a3c1399285928d1192b25e8dfef7c41084eb04987e31cb12860f51e10627aaea03f80d6d394a45b46ce43e37092f6fad6f06c2382b48a30
-EBUILD nettle-3.9.1.ebuild 2771 BLAKE2B dceddb86e5d689a8466400800013a54d556d224ab1670848efb77976920430ae1674daf72d8234aa4e374a119a08d8ffb8308ad63955fc213c7ea6457c3d7e49 SHA512 b38045798c6bc78135621202cb6805d622285d63788909eb244b827184fafdf33493d871dc34b02911c6c5aa6f8bd62920a99f96923c9fd6caf1d82a514c8d6a
-EBUILD nettle-3.9.ebuild 2775 BLAKE2B 398d74b891728f19012f2125332889b17737e044c5e4469ed684ddbf96bb0eab9bcc447002cb93b1a48660c467123761eb73d7590135a6b3a63fab52db68fe50 SHA512 d74e24f6bd5d915dd1d929058d7810a60d2a8a1e646778f77de03c61b7eb53db633caf13f269aba0f23fdde593fe8f890bedfa241bdeb54bb7758bdc2b0632e5
+EBUILD nettle-3.9.1-r1.ebuild 3113 BLAKE2B 57b7050e5d17abee26bcaf7a8acaaa392133457a01ab67c8b483a4f3c814602479e1d0489ae13b2cad07c687b567ae5768d0a48680be3a0b3edf994145c30143 SHA512 cfe542893db48ffbfa9b5e649dbe716099339c787657ed1e53095ce0268c5a39b75348294c7f45261029ad93908fdeee25e929b9a3bcd8464e6d5c2c497929fb
 MISC metadata.xml 401 BLAKE2B 8840ace8e513d9ee82322e82f348b15c94ed9ece2b102bc2bb977041e518f56f5f6b068318771759b1895d47db084026ae443841a9f305cf965c37121ef0100b SHA512 b2c4a89887b5882fc8e04a83e047d2f9bdc60e2f1799fd724c83275acd1f7b9b4c1c08c4c3ada810f5d30cf3c6048cd8043c7792dd909969b7e4bf4da66b42c8
diff --git a/dev-libs/nettle/nettle-3.9.ebuild b/dev-libs/nettle/nettle-3.10.ebuild
index 2d307d66cb40..b79aa1e683e3 100644
--- a/dev-libs/nettle/nettle-3.9.ebuild
+++ b/dev-libs/nettle/nettle-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
+IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
 	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
@@ -54,6 +54,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# We don't want to run Valgrind within ebuilds, it often gets
+	# confused by sandbox, etc.
+	export nettle_cv_prog_valgrind=no
+
+	# TODO: USE=debug w/ --enable-extra-asserts?
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
@@ -63,13 +68,11 @@ multilib_src_configure() {
 		$(use_enable cpu_flags_arm_neon arm-neon)
 		$(use_enable cpu_flags_arm_aes arm64-crypto)
 		$(use_enable cpu_flags_ppc_altivec power-altivec)
+		$(use_enable cpu_flags_ppc_vsx2 power-crypto-ext)
+		$(use_enable cpu_flags_ppc_vsx3 power9)
 		$(use_enable cpu_flags_x86_aes x86-aesni)
 		$(use_enable cpu_flags_x86_sha x86-sha-ni)
 		$(use_enable cpu_flags_x86_pclmul x86-pclmul)
-		# TODO: PPC crypto flag?
-		--disable-power-crypto-ext
-		# TODO: How do we detect this in ebuilds reliably?
-		--disable-power9
 		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
 		# TODO: cpu_flags_s390?
 		--disable-s390x-vf
@@ -85,5 +88,12 @@ multilib_src_configure() {
 		--disable-openssl
 	)
 
+	# https://git.lysator.liu.se/nettle/nettle/-/issues/7
+	if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then
+		ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7."
+		ewarn "Disabling, sorry! See bug #920234."
+		myeconfargs+=( --disable-power-altivec )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/nettle/nettle-3.9.1.ebuild b/dev-libs/nettle/nettle-3.9.1-r1.ebuild
index f2e77b0432af..5f20798db8f1 100644
--- a/dev-libs/nettle/nettle-3.9.1.ebuild
+++ b/dev-libs/nettle/nettle-3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -83,5 +83,12 @@ multilib_src_configure() {
 		--disable-openssl
 	)
 
+	# https://git.lysator.liu.se/nettle/nettle/-/issues/7
+	if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then
+		ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7."
+		ewarn "Disabling, sorry! See bug #920234."
+		myeconfargs+=( --disable-power-altivec )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }