gentoo auto-resync : 24:03:2025 - 00:31:53

9 files changed, 205 insertions, 49 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index cee04ac46f12..21c21b98f516 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest
index 6b7ad1f84b70..cb9f15dc002e 100644
--- a/sci-libs/branca/Manifest
+++ b/sci-libs/branca/Manifest
@@ -2,5 +2,5 @@ AUX branca-0.6.0-test.patch 333 BLAKE2B bdf1a556ff4b2e8b023a216a84af4b97cefe1c86
 DIST branca-0.8.0.tar.gz 43075 BLAKE2B 46779d59ca981c1f6e76193b1776c77a7c455b67d93115027b17f96b8c4df737502dc32feb6ce242e0f2fec9ed4541ed79c6856e85d740dec40d092000873b32 SHA512 b5e8ac51a5d1b70ee72066ee16c9fc8d37623ca807c67cf0f5a2daba37f901ecd9eb81b03857c222ace1f36fb71a9a348aae7079deccf657eaabcc1dc6b64158
 DIST branca-0.8.1.tar.gz 43109 BLAKE2B e2b123be2d9cb2192f9cdd93842249b0f30c8edf85b401b4a48e1e8e4b4a60c689fe74278faabefa0fdba314f484e81b0f4e0a70e37397c827d3f0b94fe84768 SHA512 70b5a8f7da69dfdf9195d3b9f7e70510a1b6cb199224b8583190aa20bb1699bed9b77c31d34dd365dbae5ef0c32f67baaaf20a2546c11203b7140c3d80f3dd2e
 EBUILD branca-0.8.0.ebuild 903 BLAKE2B fa039994a34a66cd55a3d6e96eebcd66b7580229eb40860236ed61d528609da1b3c05fcddf191f27ea57d2fb31401a11ca75b769b6125a7697a83319a9f3c786 SHA512 f4c9663d4f5c46faa7eba85e4e18e836ee8d85a494ba4b07cb1a45e03772091b79b584cb98510a30d0e9aeebba8c315ae18155540cf9cf73b846b56548791dc2
-EBUILD branca-0.8.1.ebuild 853 BLAKE2B ca53331dc000d5855d512a43e544df62322710ea14c0c7e0cca8f5e7fbbf3f025ba6738ce4d21ca3c54b1917f1ce13448439d938d42a03e593bb7d28073313cc SHA512 d529ddf0e20419efdf9e3e904a29f22d42f0e0f7cc9829738ca75f06f34855f265f14fe453271b2f78cb56fe2341392d92239a374f4c0b77a8f6e268545bddeb
+EBUILD branca-0.8.1-r1.ebuild 853 BLAKE2B 358608aecce3dfde718c19451677056bd18fb8b96ea2bc9cd3fb4e24bdcb6af6ed4b4d500d690b09216ed6108c14425984faa696063e4af6ced9e557305edbb2 SHA512 6d3f634b4da54b74fa3719df42252f3a1ad8a183e52e622967aaae5ada6b0bfef276b854d9f882c2fb53bc98daea40919221992c29d121286c40c4494bc00597
 MISC metadata.xml 567 BLAKE2B a65dec67ea324de3bd665152174cd5d8ca121d2775e9e6db7d15f2c1a2b60058f8788769d2cd4ae54d454b667b9581fe84006b2eebfde99ccdb63ed5d015ff6c SHA512 9cff06968cb58902bc68dab33859310746e7fba3420a53f04c6fa45c5aeda061a68c41343b71240670b21d116d80fe9e6d40c7ba281e2910b7a95caebfcd5dd8
diff --git a/sci-libs/branca/branca-0.8.1.ebuild b/sci-libs/branca/branca-0.8.1-r1.ebuild
index 3a77c1baafb4..821aa7ce13df 100644
--- a/sci-libs/branca/branca-0.8.1.ebuild
+++ b/sci-libs/branca/branca-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 inherit distutils-r1
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 666610d40b5b..dab4252ab89b 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,4 +1,6 @@
+AUX fftw-3.3.10-fixup-cmake-optional.patch 1027 BLAKE2B 230f57b37b179fdc30fcb16777a64c4363511e684937019700ad883723b47fe32c8cab7730ba04bc191bb0199e3b8fd7303a97d90cdabd70354e9f1b80860d0f SHA512 517ea0d21ba360db7c9d2fe805dec9de30362a71a567e7b034f7c569433d206f6b3abae4a8dfb704970e02d8d9b30cb9a578946417b4c1986fbfee6db68267b0
 DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
+EBUILD fftw-3.3.10-r1.ebuild 4134 BLAKE2B 1299a21b0a4644ef480dcb03f2fa88674a8ccec9c890436ddb97ba6fcbccf592eb78b4a0250ba25789bd9db8c1a0dfda2e57601ec13339363b216fe2d01109ec SHA512 661d0dbd400cd2b7fc1efd872f69a0aa8bf90e8f089a0b3d71ec61f525e6856fa6f9a1adfbacdcfa36f0124b9a09d1dd54e82f68acd8abcf2021c2c61aeb9d59
 EBUILD fftw-3.3.10.ebuild 4204 BLAKE2B 650ac6bdba7c0d3b68adbc3c78571e4448971929b3712b319837fbd38d5945aea082ab2b7412bd12c7c5b66ef94d6886fa2575d4f607fbeb0e095c97cef9565a SHA512 544e3657730f4f57ab31154b237f3f749ad606591c5aac1c09952f5f62db98f41642a7e1598611d9fa24bf1a704603f6de38c5b1e75cad6b806a704251d6c79b
-EBUILD fftw-9999.ebuild 4199 BLAKE2B 088c5bdbf41c0ed5217ac6a2c6b1ccff3a5ea9a9a4bd4aa91d30848f8913fdf436e6f799ecc8a1c3f2099708fd85e84b36a8acc6580c71e6956039e3d4dd29ae SHA512 15c0e8e86acec1b1494ce3814ef3984450ba6597a283e765688fb348ac666e61431ad31d0fea5d4de2df23def7bda321792da862475f1dd83ff1f8b968c1c266
+EBUILD fftw-9999.ebuild 4066 BLAKE2B b07e65284a0472b2332d861a1f6b08b2f8e09ae53cb3c32cd833111bc6264af7c29dba532511e7b618c63fa1f68daeb515c3109e62b614ef7cd980504e421913 SHA512 aaac39979490b7547d73af645582d10eae0a54db4e8e2f164744af77da4347875adfdbdf78ee165b45be1c1d7143698c4ffafd5b0b5fb90c1ae4db0633c730c5
 MISC metadata.xml 914 BLAKE2B beea3b7d30a0b0568e8741f15600acdb0652e2c33f3ef5f95d0d0a4f4efb2aacb3c7215bbc3abbae67764d5b36a1e0caae99d641be20183fe5bb2ce069bd7db1 SHA512 2bbb2863f5617f387d4b382caa77e894a485e819ebd852939830c585e762c8e3a2d05532bdf2f44b2d59294f0dbec3b14dca6f2c00bdbc547331db7eddc6c9ce
diff --git a/sci-libs/fftw/fftw-3.3.10-r1.ebuild b/sci-libs/fftw/fftw-3.3.10-r1.ebuild
new file mode 100644
index 000000000000..3d3387fcb597
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.10-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="https://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
+RESTRICT="!test? ( test )"
+
+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+HTML_DOCS=( doc/html/. )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# check fails with any version of gcc. On <14:
+	# <artificial>:(.text.startup+0x19): undefined reference to `_rtc'
+	_rtc
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.10-fixup-cmake-optional.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+	MULTIBUILD_VARIANTS=( single double longdouble )
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		# fix info file for category directory
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+
+	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
+	# --enable-quad-precision is a brittle feature that requires
+	# __float128 support from the toolchain, which is lacking on
+	# most niche architectures. Bug #770346
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable cpu_flags_ppc_altivec altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable cpu_flags_arm_neon neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: ${n}"
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	augment_pc_files() {
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+			local u
+			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+			done
+		done
+	}
+	multilib_foreach_abi augment_pc_files
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index b7841feffe05..3d87f75be718 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -132,12 +132,9 @@ multilib_src_test() {
 }
 
 src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
 	# Do not increase the number of threads, it will not help your performance
 	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
+	#     ${testbase} -${p}d || die "Failure: ${n}"
 	multibuild_foreach_variant multilib-minimal_src_test
 }
 
diff --git a/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch b/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch
new file mode 100644
index 000000000000..ea09c4c9741a
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/913518
+https://github.com/FFTW/fftw3/issues/130
+https://github.com/FFTW/fftw3/pull/338
+
+From f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7 Mon Sep 17 00:00:00 2001
+From: Tobias Mayer <tobim@fastmail.fm>
+Date: Tue, 24 Oct 2023 13:46:33 +0200
+Subject: [PATCH] Fix the cmake config file when configured with autotools
+
+When the autotools based build is used the FFTW3ConfigDeps.cmake file is
+not generated, so including it fails with an error. By making the
+include optional, the config file can still be used in a limited
+fashion.
+--- a/FFTW3Config.cmake.in
++++ b/FFTW3Config.cmake.in
+@@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@)
+ set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@)
+ set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
+ 
+-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake")
++include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake" OPTIONAL)
+ 
+ if (CMAKE_VERSION VERSION_LESS 2.8.3)
+   set (CMAKE_CURRENT_LIST_DIR)
+
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 1c06f810d404..b89fbbb8d848 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,5 +1,3 @@
-DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
 DIST shapelib-1.6.0.tar.gz 528882 BLAKE2B 02561b947ede10dcbb04ebe4d007b99ac2421ab56251a981e0bf4033b33bc5ae3a09a919c295a41797e7c295424d027a5f650848196f945918f7d6aeea177f89 SHA512 cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc
-EBUILD shapelib-1.5.0.ebuild 738 BLAKE2B c5bab0aa07847ca34b955df4073c625fae350f7c5beac1aea51ae0ff7a7d1ae6c8c0952442c64775ece4e49982e780e1e4c5efeb7105af320ab81b2d0393c008 SHA512 b33d2a2ceafee3bbf97839c6eb85e7a04452e6ba0d1fc158ed20744c12f5f29a1deaf395b0fba5c7789355bbb6606405a4fc0801a3770c9e4de123fb75a89394
 EBUILD shapelib-1.6.0.ebuild 779 BLAKE2B e095afcec16b2061617deeb82b1da9e5f945bf1d6f64a7576691f4d74c34a02003766c988ab795deaae21b0b96d24a7d880c6e28eab1843f79b4d88270861c34 SHA512 957b2b991cf02f42dab01b5aa1d39b55dde1c8548b71a4572d1961c346996050233a71ba9ea01f5bd4a638dad772954a0005335c94f117b17f44717f7a85742f
 MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
deleted file mode 100644
index 1780ce65a758..000000000000
--- a/sci-libs/shapelib/shapelib-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating ESRI Shapefiles"
-HOMEPAGE="http://shapelib.maptools.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-src_prepare() {
-	default
-	rm -f m4/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}"/usr/include/libshp \
-		--prefix="${EPREFIX}"/usr
-}
-
-src_install() {
-	use doc && HTML_DOCS=( web/. )
-	default
-
-	if ! use static-libs; then
-		find "${ED}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}