gentoo auto-resync : 11:04:2024 - 12:32:48

4 files changed, 33 insertions, 11 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 5753e1a4dfb9..72271cfee201 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index 5c3cb5c4eaa7..3591c2c84e5c 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,6 +1,7 @@
 AUX xfoil-6.96-gfortran.patch 920 BLAKE2B 3ab603034f6b2be74e884ce476410698a5583c4fda751fe24d9462b7441170f7bc04c0f8fd49ad1001c92dfae4a2d2c20bdc555b8ba0d7794fd457d3013f6222 SHA512 7f708a3176a08367b125cbe30dcb1830e05df55706e32b5e8964317d0bf961ba0032dd7237f3a721ec3d7b813792decfb9a6d4e750fbb72d70a92a26b1d287ef
+AUX xfoil-6.99-ldflags.patch 302 BLAKE2B 5180f001d8c31cf9703c27528f8599b77219eb2d995515b276bd0152034687b87266476acf752fee85918510644465a9dd8eff82d85e6e5c149dfcf93fa7a727 SHA512 9f3af13261baf6fbb2ed69d4c7da808e06de873928131962305bc70237f28048f5c13e12c875b15a485f6b6266e041cc300edc541d169dff82f1af93cc6d4e6d
 AUX xfoil-6.99-overflow.patch 399 BLAKE2B e98e8c2774a5be9b22ef28b172ba8dfdfff196bff88beb2a911f72caad25c88b01fa657e4812c167a30e914997131b61e75333b2cc851013b2502dc132c22d96 SHA512 8d6defa10c11c204128bea359461da12c3780f178d9738071f5f111d26d6151adbfa67e6898b814df4740e6b7006f5bbbd6ec3bc4ddf65fb511b1ffdf79c468f
 DIST dataflow.pdf 7654 BLAKE2B 67871007f6d2d72fe89c0f3bfcd7027d08ad8d064a0426c2947c5e41d6a31049973dd8b586ca0dd482def6745023c337157a77dbf35b541a5f3a8295f0162b03 SHA512 1bb5be8e70fca1fa90f28d214140e96a8795c7d82a37f4fe4d68606fa3eb28252913b8fb13eb3e97a3cf05c3001c88dbfcdb8a2f20d4baed5e730770a2d602b1
 DIST xfoil6.99.tgz 4515991 BLAKE2B a96dc534a0ceff116970a22b9e267705065076f1561052334c4706d7d6d2d750ad75954fb9af843ef50ca5e8ab8cfd4c8e5d873f9f36b6337fe3381604cb2d37 SHA512 6f5bed520826dba2efd1b191b1f90dd810b53d9041cbbaddde09207ba9042f99dd0c9e9aa8b8cdf48767bf2695e328ac8fbd297e1510e53ac10b0f1eea35cfef
-EBUILD xfoil-6.99.ebuild 1917 BLAKE2B 004559a0753527ee5f2ffe2cd46dd74dd9ed83b1ef538223222648725cff6f6fa699d9998e7ec985f848424dc235b411447b5f9767f40f46436ded4e5b6ef72a SHA512 122289cf69ef2ab7fe7e78b3d548c43a00dc4e6a635f7c989fd59d5fbb51b87bebd87fd6db9fb313bd8336b8f228213cb25919411ee6a760447c58af76159889
+EBUILD xfoil-6.99-r1.ebuild 2121 BLAKE2B 5a7493ce1699640576ed4a8886952bd404a68abe0a354faef071bb0cb3490bc21ad274fa21fa57b8b5a5fb965e3e30635f909db518ec8359c2b6c3022a6ec4a6 SHA512 52feda29e2f795003bcc814fd91a65c4bf5e4e2890b1d8b1e932a59c4ddb119c0ad9a02b77a1c5af4afaba436c5c2ca3a051acdfca26f6da0363814425c3b88a
 MISC metadata.xml 970 BLAKE2B 493544a3641a1317e9075363b5183cd60c2707756dc53c9dda6a4f9d46a97df94557971700b56dcd4e7b258945ff299c04ed97a6cabc6fe8953ee49631bff048 SHA512 b98995cce0cd2020fb281139fbedc66794456290fe602b039c0024eedf6eef9eb8b258c9ebcc6076fe3d466fb6234b7f7871f97747a3c7fadaadf307dcd2802e
diff --git a/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch b/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch
new file mode 100644
index 000000000000..4667a891d8a7
--- /dev/null
+++ b/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch
@@ -0,0 +1,12 @@
+Fix bug #771615
+
+--- a/bin/Makefile	2024-04-11 08:00:24.832420892 +0200
++++ b/bin/Makefile	2024-04-11 07:59:56.052410291 +0200
+@@ -152,7 +152,7 @@
+ 	$(INSTALLCMD) pplot $(BINDIR)
+
+ blu: blu.o profil.o
+-	$(FC) -o blu blu.o profil.o
++	$(FC) -o blu blu.o profil.o $(FTNLIB)
+ 	$(INSTALLCMD) blu $(BINDIR)
+
diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
index 36047f4e3d56..9628062e61ee 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"
@@ -19,9 +20,10 @@ IUSE="doc examples"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
-
-S="${WORKDIR}/${PN^}"
+PATCHES=(
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
 src_prepare() {
 	# fix bug #147033
@@ -52,7 +54,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 +66,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
 }