gentoo auto-resync : 05:06:2023 - 15:37:05

3 files changed, 21 insertions, 12 deletions

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index e2e9bd073a67..d271cabcc81b 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,4 +1,4 @@
 DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.5.1-r1.ebuild 2071 BLAKE2B 63b41f8d75761d7d002238955c7c3a8f81af90cd3db436eec1e5a30017995f2ffa2456d912e3b103bdb25d3916e5d6f94b17f70ae5960b91fa83bb870f3201a3 SHA512 71a9d39b67f2144522090613a9143585ae17727d200958a89ae7317d6dacaadcdf09d5d10fcca2c00c77f507243fd7e56bfef9cbdc989c42a27f828a8be18dc6
-EBUILD ntl-11.5.1-r2.ebuild 2123 BLAKE2B a877421a688fabb0b046591d3e0f715cb254b4e8feeba95d9e4b01b0649700f89ece30ac1c296ec59d88d0dc2bd962108509732edf72645171c47e57e9cf3e5c SHA512 34955939a5ad0a1f8c60b66bf506ac3423b8d78643f267bb96faaa14f516fdb220734bbd5aabe091ef6c368eee8be164fa77ec36107fe24bda50cd6b6fd46001
-MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
+EBUILD ntl-11.5.1-r3.ebuild 2561 BLAKE2B 200992893e76e9b74cad467fd961ec8e884e01bc071e856d7a74172b7eb4dec30a0c126e245189b3a18dee343c509236dbcc5c2934406db11effc9117f058392 SHA512 ac8157016dedd9f8eb3a4776c5334b35db83996cb2cc4432b8b159a26af6dd64aca8594b7d34fb73536d913a32784bb58b55b69061153ca460eb407800016ae1
+MISC metadata.xml 628 BLAKE2B 12ef87b42f60ca7bd5f91708c96471378481bfdc911d638a550608f62928a40e879431028f6e578047b79749e0c8307a4075520434191099adece5a771e5c27f SHA512 724f4bc44918ec49f4bb30ef7c9cc6de8c4243845a2a4c7d8c73db6f1db8fa548ad0932f324deea2002ea35cb7b410120cb86a0743bb2d6765fcd987593fcd84
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index 41060691e818..495cab106d33 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -11,4 +11,7 @@
 		integers, and for vectors, matrices, and polynomials over the
 		integers and over finite fields.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">libntl/ntl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/ntl/ntl-11.5.1-r2.ebuild b/dev-libs/ntl/ntl-11.5.1-r3.ebuild
index 5601959c8c2a..1b7f7af03821 100644
--- a/dev-libs/ntl/ntl-11.5.1-r2.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/44"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc static-libs threads cpu_flags_x86_avx2"
+IUSE="doc threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
 DEPEND="dev-libs/gmp:0=
@@ -35,6 +35,16 @@ src_configure() {
 	export CC="$(tc-getCC)"
 	export CXX="$(tc-getCXX)"
 
+	# The "AVX2" detection within NTL does more than just detect AVX2;
+	# it also checks that (for example) the size of a "long" is 64 bits.
+	# If we try to enable the AVX FFT (based on the avx2 cpu flag) and
+	# if NTL determines that AVX2 is unusable for some other reason,
+	# then the build will fail (bug 815775). To work around that, we
+	# disable the AVX FFT on x86 entirely. This still isn't perfect, but
+	# it should fix the cases we know about.
+	local avx_fft=$(usex cpu_flags_x86_avx2 on off)
+	use x86 && avx_fft=off
+
 	# Currently the build system can build a static library or both
 	# static and shared libraries, but not only shared libraries. The
 	# name NTL_GMP_LIP is *not* a typo.
@@ -51,7 +61,7 @@ src_configure() {
 		NTL_GMP_LIP=on \
 		NTL_GF2X_LIB=on \
 		NTL_THREADS=$(usex threads on off) \
-		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
+		NTL_ENABLE_AVX_FFT="${avx_fft}" \
 		NATIVE=off \
 		|| die "DoConfig failed"
 
@@ -66,15 +76,11 @@ src_configure() {
 
 src_install() {
 	default
+	find "${ED}" -name '*.la' -delete || die
 
-	if ! use static-libs; then
-		# bug #775884
-		find "${ED}" -name '*.la' -delete || die
-
-		# Use rm -f because the static archive may not be created when
-		# using (for example) slibtool-shared.
-		rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
-	fi
+	# Use rm -f because the static archive may not be created when
+	# using (for example) slibtool-shared.
+	rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
 
 	rm -r "${ED}"/usr/share/doc/NTL || die
 }