commit: 8029cc3cdcc002d98e46cced54851893ffa3f19c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Mar 30 20:27:54 2024 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Thu Apr 11 06:04:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8029cc3c
sci-physics/xfoil: EAPI8 bump, fix bug #820623, #725718 Closes: https://bugs.gentoo.org/820623 Closes: https://bugs.gentoo.org/725718 Closes: https://github.com/gentoo/gentoo/pull/36004 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> .../{xfoil-6.99.ebuild => xfoil-6.99-r1.ebuild} | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild b/sci-physics/xfoil/xfoil-6.99-r1.ebuild similarity index 78% rename from sci-physics/xfoil/xfoil-6.99.ebuild rename to sci-physics/xfoil/xfoil-6.99-r1.ebuild index 36047f4e3d56..23bffe5c71d6 100644 --- a/sci-physics/xfoil/xfoil-6.99.ebuild +++ b/sci-physics/xfoil/xfoil-6.99-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit fortran-2 flag-o-matic toolchain-funcs DESCRIPTION="Design and analysis of subsonic isolated airfoils" -HOMEPAGE="http://raphael.mit.edu/xfoil/"; +HOMEPAGE="https://web.mit.edu/drela/Public/web/xfoil/"; SRC_URI=" - http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tgz - doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )" + https://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tgz + doc? ( https://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )" +S="${WORKDIR}/${PN^}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" @@ -21,8 +22,6 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-overflow.patch ) -S="${WORKDIR}/${PN^}" - src_prepare() { # fix bug #147033 [[ $(tc-getFC) == *gfortran ]] && PATCHES+=( "${FILESDIR}"/${PN}-6.96-gfortran.patch ) @@ -52,7 +51,11 @@ src_compile() { pushd orrs >/dev/null || die bin/osgen osmaps_ns.lst || die popd >/dev/null || die - emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE" + emake -C plotlib \ + CFLAGS="${CFLAGS} -DUNDERSCORE" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR) r" \ + RANLIB="$(tc-getRANLIB)" local i for i in blu pplot pxplot xfoil; do @@ -60,6 +63,9 @@ src_compile() { PLTOBJ="../plotlib/libPlt_gSP.a" \ CFLAGS="${CFLAGS} -DUNDERSCORE" \ FTNLIB="${LDFLAGS}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR) r" \ + RANLIB="$(tc-getRANLIB)" \ $i done }
