gentoo auto-resync : 10:01:2023 - 12:20:33

4 files changed, 75 insertions, 59 deletions

diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 23a6f0844252..974a4857b15c 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
-DIST pyFFTW-0.13.0.tar.gz 158660 BLAKE2B c54096f0814625d49832094a6d823c6d258801a0831b07846993da97a713238a5df5b59beddc38b7e940685403178b2f3100f5713334fc9861757420bc87303a SHA512 1d4c69cc19dd00f2433037f25ea90335544403b542c0c5ca00cb055e0fde076ec9e00990f02da2385466be171ed8c910a5ce06a7cfa5efbc6544b2383bbce599
-EBUILD pyFFTW-0.13.0.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
-EBUILD pyFFTW-9999.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
+DIST pyFFTW-0.13.1.gh.tar.gz 159322 BLAKE2B f64ad74ac51c9e8c7a8137a212b43fe173a072006e3ec46e962c2bd48a3626d3c856acfc722977dc50a78afe0848ca9b25bd89b9b67168ddb285996cb18dd3ea SHA512 645d01ba94d652f9df4c5f8352f483de049df5fd846989024698365045b7b72293d9c84bd39ca2039e32db07796bbcb97eeafc8442ef4ab1de041539ed41bf9e
+EBUILD pyFFTW-0.13.1.ebuild 1045 BLAKE2B b626452596081e932a92bb2e62bb489b1dcfc1fcac1eb0d2d9484ef14a756b0038fdd40ad422c36e0799cf13fc2b53c2a62f6f07e1288b1a4b7af67ab395ce7e SHA512 7087d06b9fb4831334be01b23dee5bbf500ff6415ff2cbecb5d6a90b5bdf7939bb4af5e293f1140f8f931ab0e11832db3b8b899e3c66e54fbe4763279bc23928
+EBUILD pyFFTW-9999.ebuild 994 BLAKE2B bb9ef9f00aa0c64ddcb0c133ebcaf037394f7a3d98fd2beb43b2a894fdfe70d59e46487bbf02596cbf4c2ee6547cb61c3d76a3cd4bed0ea69e73a40c9f46fe8c SHA512 ab2a7849d16e6f23feaa95d5680d2d7f772f6e48d425ffe2a503672e0c7b0f50c17682c74b437aeacd1a4b90f7830cd7e3c50d9bff8db91df047c6621939afa2
 MISC metadata.xml 570 BLAKE2B 8229871aa2a0c9979a18661fd1c1ad5e5990d2f0094cef6607bff26372903727745f4ef69db073a8161ae218b3d0f7730d160435bfb503d99544590aac79860e SHA512 a219be98262af880f0786b71d3b57683fe5a1a7ff91c9fd62975ef9825f493558e2b0aab2e20653b38cbe053e1364027149642c52c0e2ac1b29f9212f3ef652b
diff --git a/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild b/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild
deleted file mode 100644
index db7b32f540a5..000000000000
--- a/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
-
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-	>=sci-libs/fftw-3.3:3.0=[threads]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
-	cd "${BUILD_DIR}/lib" || die
-	eunittest
-	rm -r tests/ || die
-}
diff --git a/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild
new file mode 100644
index 000000000000..aea45023f2cf
--- /dev/null
+++ b/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pythonic python wrapper around FFTW"
+HOMEPAGE="
+	https://github.com/pyFFTW/pyFFTW/
+	https://pypi.org/project/pyFFTW/
+"
+SRC_URI="
+	https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	>=sci-libs/fftw-3.3:3.0=[threads]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	# otherwise it'll start with -L/usr/lib, sigh
+	export PYFFTW_INCLUDE_DIR="${EPREFIX}/usr/include"
+	export PYFFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+python_test() {
+	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
+	cd "${BUILD_DIR}/lib" || die
+	eunittest
+	rm -r tests/ || die
+}
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index db7b32f540a5..2561ff31ec5b 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -1,39 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 git-r3
 
 DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
+HOMEPAGE="
+	https://github.com/pyFFTW/pyFFTW/
+	https://pypi.org/project/pyFFTW/
+"
+EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
 
 LICENSE="BSD"
 SLOT="0"
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
 
 DEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
 	>=sci-libs/fftw-3.3:3.0=[threads]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests unittest
 
+src_configure() {
+	# otherwise it'll start with -L/usr/lib, sigh
+	export PYFFTW_INCLUDE_DIR="${EPREFIX}/usr/include"
+	export PYFFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
 python_test() {
 	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
 	cd "${BUILD_DIR}/lib" || die