From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F9F8158092 for ; Thu, 16 Sep 2021 01:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC5ABE0831; Thu, 16 Sep 2021 01:45:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1BA5E0831 for ; Thu, 16 Sep 2021 01:45:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF12F335DBC for ; Thu, 16 Sep 2021 01:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D4FDC8 for ; Thu, 16 Sep 2021 01:45:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631756482.a580532de52c209b8dc15a164a9bcba141fc69d1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/fftw/Manifest sci-libs/fftw/fftw-3.3.10.ebuild sci-libs/fftw/fftw-3.3.9.ebuild sci-libs/fftw/fftw-9999.ebuild X-VCS-Directories: sci-libs/fftw/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a580532de52c209b8dc15a164a9bcba141fc69d1 X-VCS-Branch: master Date: Thu, 16 Sep 2021 01:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d1a9274f-835f-4161-b6dd-cbb355a20e69 X-Archives-Hash: 34a7b6861b9abd78caa287bf18688977 commit: a580532de52c209b8dc15a164a9bcba141fc69d1 Author: Sam James gentoo org> AuthorDate: Thu Sep 16 01:41:22 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 16 01:41:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a580532d sci-libs/fftw: add 3.3.10, sync live Signed-off-by: Sam James gentoo.org> sci-libs/fftw/Manifest | 1 + .../fftw/{fftw-3.3.9.ebuild => fftw-3.3.10.ebuild} | 16 +++++------ sci-libs/fftw/fftw-3.3.9.ebuild | 4 +-- sci-libs/fftw/fftw-9999.ebuild | 31 ++++++++++++---------- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index a4327766903..77f9c12fde3 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1 +1,2 @@ +DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild similarity index 92% copy from sci-libs/fftw/fftw-3.3.9.ebuild copy to sci-libs/fftw/fftw-3.3.10.ebuild index cbd8e2451a7..c8a32cdc88e 100644 --- a/sci-libs/fftw/fftw-3.3.9.ebuild +++ b/sci-libs/fftw/fftw-3.3.10.ebuild @@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" +HOMEPAGE="https://www.fftw.org/" MY_P=${PN}-${PV/_p/-pl} @@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" else - SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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}] )" +RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-lang/perl )" +BDEPEND="test? ( dev-lang/perl )" -S="${WORKDIR}/${MY_P}" HTML_DOCS=( doc/html/. ) pkg_pretend() { @@ -65,6 +64,7 @@ multilib_src_configure() { $(use_enable threads) $(use_enable openmp) ) + [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode ) # --enable-quad-precision is a brittle feature that requires diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild index cbd8e2451a7..e377ed60541 100644 --- a/sci-libs/fftw/fftw-3.3.9.ebuild +++ b/sci-libs/fftw/fftw-3.3.9.ebuild @@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" +HOMEPAGE="https://www.fftw.org/" MY_P=${PN}-${PV/_p/-pl} @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" else - SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index 23c52fd7f3d..c8a32cdc88e 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" +HOMEPAGE="https://www.fftw.org/" MY_P=${PN}-${PV/_p/-pl} @@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" else - SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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}] )" +RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-lang/perl )" +BDEPEND="test? ( dev-lang/perl )" -S="${WORKDIR}/${MY_P}" HTML_DOCS=( doc/html/. ) pkg_pretend() { @@ -65,6 +64,7 @@ multilib_src_configure() { $(use_enable threads) $(use_enable openmp) ) + [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode ) # --enable-quad-precision is a brittle feature that requires @@ -147,13 +147,16 @@ src_install() { rm -r "${ED}"/usr/share/doc/${PF}/html || die fi - local x - for x in "${ED}"/usr/lib*/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 + 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 - done + } + multilib_foreach_abi augment_pc_files # fftw uses pkg-config to record its private dependencies find "${ED}" -name '*.la' -delete || die