4 files changed, 87 insertions, 7 deletions
diff --git a/sci-libs/qfits/Manifest b/sci-libs/qfits/Manifest
index 6d4cb9e2fa5d..b55c46946e41 100644
--- a/sci-libs/qfits/Manifest
+++ b/sci-libs/qfits/Manifest
@@ -1,5 +1,7 @@
+AUX qfits-6.2.0-includes.patch 834 BLAKE2B a72dbd038c9f753b98d7bde23b8eceffd80e2bc639bb618fb0200a0c4559ee2afb2e9bb219d37cecf93b3cce5d4562c4ea77bfed76ca85bbbf7e7bb2d70f2d6b SHA512 260b1b68e02142dc490e11d1c66e3c0876df3c331f5a5ad799fd984456c6eda56b4265be899f20cfff404d84ad770843c7c1947aeb8cb59cafc787015bca8151
+AUX qfits-6.2.0-m4.patch 725 BLAKE2B 66950bbfda444e58bab84197443c9746f71e75251f73b24d76c8ba023f4c5b1a4abc997c3416e2a6016a70bd6e403d5bee4a37f7dfb1f523517fc91e180d44f6 SHA512 77f001a3e45d8d85abed5c7933cfba9157fbb3f7530e905c1f581a58b90bf8492ccc4d1f2be42f836d67dba2697a7c8ff41a3292deffc2ce87e622bb61b97047
 AUX qfits-6.2.0-open.patch 512 BLAKE2B a3701d2a9f8d6cbee3d5d9e95b281068b29b2d2f327140086830462a89cb657b00fd1a6e57fd5b593ada0788ba398cfda1fbdd15c9bf302fe84d6b7e09d32e14 SHA512 83bb2d96725e62fd1f593cd38f86d7c4dba2248b34d9eeecb6af11d41b20fde2a5b0bf22e3b64001d9d473b0344120f3df604982ab7d998c37c08771f17309b5
 AUX qfits-6.2.0-ttest.patch 304 BLAKE2B a5cebbd782f1d8fd9090a20f51a52fd756509b479ec199c1efea734e557eae5994515ab003ac920dde1781ee98afff0cb25ed0eb91a92e8821d269e1e9188c8d SHA512 dde0bfbe7aef8ec381ec57b4fdae5419c9ad23ec20d90ee795bf5cc124abf3e6e936f7069d3cc56ff86b766425c2a94304048263310fcf3f7c84415638e073f8
 DIST qfits-6.2.0.tar.gz 475191 BLAKE2B fea94bf77b07e5fbc9493f4bafbf37387b4f9ae83212ffc5a6c0607cad972a592e3937ba042ee94f053f30fd05cbafb8fcbcf2df1c4cd6ee4d2422bf108d9395 SHA512 a0f6863a9e5b26d08de487cfdf468b3d04218a36a01cd9df8b786b1cdf2ffa61acf12b087f4fbd751ba023f02b5a32410949a4ee08432108a7129a283ab3d824
-EBUILD qfits-6.2.0.ebuild 596 BLAKE2B 90ec42dfc65cdc7352b05d357ac0974ebbc0283b35bc07dbd883ffd0f0c92b1bed80a3b017a54341e5d6710a16eee8ac8a25c7a653e9c196a21c820004c8a0ed SHA512 4ca8e8669e922ebf91bd1a4fa1295bf33abec479e050211531af77c969574ec4dacd7f51b0743d5d7e651acbe72c521db6f160168a13956d6a9c5b2f772da41e
+EBUILD qfits-6.2.0-r1.ebuild 744 BLAKE2B 06a83bb880abbe28a4eb72e3f48dda87a503c46eb0155be7d49a162e06810bac1823c1ae14fd3c00f8c8724f9cc86fb28b0977dd6b8c548cc118b2d54f1bc6eb SHA512 25fcb91cb89427d0e48f5e4d028d612e5e6423e82ee85ab68fcfd4e3f163146d2361c3a2b40c14fff5c4333aa9597a33ff19d433d8c8d5ae5120c58ab413ac37
 MISC metadata.xml 852 BLAKE2B 8845945452ba7410e80bc386662acfdf3dc2fa5ff512f22964efdccb3b10207f0276c781a4ee81fccedd60fcc995049a7ff3010fd53e8b5f3c14508b1b57ae46 SHA512 8dff179d349cb4f91e2b1292b8830071a22d3611fa8800be6ff015a4750277587153a19213fe458e2b7b6632ef60b06c9e00ff782d955ae7ab04b279cd0a9e7c
diff --git a/sci-libs/qfits/files/qfits-6.2.0-includes.patch b/sci-libs/qfits/files/qfits-6.2.0-includes.patch
new file mode 100644
index 000000000000..7589b49301a1
--- /dev/null
+++ b/sci-libs/qfits/files/qfits-6.2.0-includes.patch
@@ -0,0 +1,32 @@
+Missing includes in main library and in tests
+https://bugs.gentoo.org/886463
+--- a/main/dtfits.c
++++ b/main/dtfits.c
+@@ -33,6 +33,7 @@
+ #include <string.h>
+ 
+ #include "qfits_table.h"
++#include "qfits_tools.h"
+ 
+ /*-----------------------------------------------------------------------------
+                                    Define
+--- a/main/qextract.c
++++ b/main/qextract.c
+@@ -32,6 +32,7 @@
+ #include "qfits_table.h" 
+ #include "qfits_image.h" 
+ #include "qfits_rw.h" 
++#include "qfits_tools.h"
+ 
+ /*-----------------------------------------------------------------------------
+                                Function prototypes
+--- a/test/test_pixio.c
++++ b/test/test_pixio.c
+@@ -41,6 +41,7 @@
+ 
+ #include "qfits_header.h"
+ #include "qfits_image.h"
++#include "qfits_rw.h"
+ #include "qfits_md5.h"
+ #include "qfits_memory.h"
+ 
diff --git a/sci-libs/qfits/files/qfits-6.2.0-m4.patch b/sci-libs/qfits/files/qfits-6.2.0-m4.patch
new file mode 100644
index 000000000000..99b39bdad451
--- /dev/null
+++ b/sci-libs/qfits/files/qfits-6.2.0-m4.patch
@@ -0,0 +1,36 @@
+Missing system inlude in self-defined autoconf tests
+https://bugs.gentoo.org/908483
+--- a/m4macros/eso.m4
++++ b/m4macros/eso.m4
+@@ -252,6 +252,7 @@
+                        AC_RUN_IFELSE([
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ int
+ doit(char * s, ...)
+@@ -701,6 +702,7 @@
+                    [
+                        AC_RUN_IFELSE([
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ void f(int i, ...)
+ {
+@@ -733,6 +735,7 @@
+                    [
+                        AC_RUN_IFELSE([
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ void f(int i, ...)
+ {
+@@ -784,6 +787,7 @@
+                    [
+                        AC_RUN_IFELSE([
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ void f(int i, ...)
+ {
diff --git a/sci-libs/qfits/qfits-6.2.0.ebuild b/sci-libs/qfits/qfits-6.2.0-r1.ebuild
index 181c4777ba8a..99af0c8cacb7 100644
--- a/sci-libs/qfits/qfits-6.2.0.ebuild
+++ b/sci-libs/qfits/qfits-6.2.0-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="ESO stand-alone C library offering easy access to FITS files"
-HOMEPAGE="http://www.eso.org/projects/aot/qfits/"
+HOMEPAGE="https://www.eso.org/sci/software/eclipse/qfits/"
 SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -12,10 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-PATCHES=( "${FILESDIR}"/${P}-{ttest,open}.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-ttest.patch"
+	"${FILESDIR}/${P}-open.patch"
+	"${FILESDIR}/${P}-includes.patch"
+	"${FILESDIR}/${P}-m4.patch"
+)
+
+src_prepare() {
+	default
 
-src_configure() {
-	econf --disable-static
+	# https://bugs.gentoo.org/908483
+	eautoreconf
 }
 
 src_install() {