gentoo auto-resync : 20:06:2024 - 00:10:56

12 files changed, 79 insertions, 553 deletions

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 895b6d0b0c30..b56ebe476cba 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,21 +1,10 @@
 AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2
-AUX cfitsio-3.490-pkgconfig.patch 613 BLAKE2B acdaedb24b8a06019346b44eade4cf9f8cdce93578a08354dab61bfa5e7979fd22ab5214676d0f08a8dde5bb70b10c0ec54527d25b73892aa6bbbe935614ee92 SHA512 46c2f7ae36529c4d3afc17afe2f22b2f21b1d5ecfa1d460fca8a95335bf94017c322412da67b57cd052ab98701e5f7776845fe30171cb400f97e2b4411497387
-AUX cfitsio-3.490-system-zlib.patch 2816 BLAKE2B eb16c43cc5be95877424469eeebc085a46fb37e78d0b2fb48db72d71c2bb05d5b85eaf6d7341ed07da25858765cb9902e1dcf8ef33f3ab42b191d2b7689976ed SHA512 4f05a0a35d6bcdc03676d9142d2cc46dd4df69aff4759464c2dc441753e7e3085c756059d2218e9deef9da91c27e760c0f73562bbc02b5a73e0044f47560ded8
-AUX cfitsio-4.0.0-pkgconfig.patch 560 BLAKE2B ca784b063cddb88ae6665d205dd91908499f1f1ae82ce185a9c45f8af972ffd4f4d5c075fb5bcaaddd639550785dff4aeb573efea3d87dc45e097811806a2532 SHA512 b4ceb89429c1e9139c8086cb6ab8dd0191678b8f868f36ee651b6b97779e16aeceec121cb5a6dac9dffc03add4f90469286a4134d7b31607614ec6a055d4c19e
-AUX cfitsio-4.0.0-system-zlib.patch 2406 BLAKE2B f17d54f549b4167d51eb073decd4924acad02c4239ea36fea78bd5c71a4f236d7285d669bd12c8e9de38468416e4262005bfd704ab5146353810bfd11c08036c SHA512 3d82bd4852619b1d10eb765f05e3dd03b8cc11dfac6f4eae48062b20b71e715c8eebe7c374fb83d38dfdb454fdb598a7b62a7d27f6517cc885d56189f4a0f2d7
-AUX cfitsio-4.1.0-pkgconfig.patch 600 BLAKE2B 4cf6c9a10f3b43f85b0b7d63bad64affd4da8aefee0b70884c5d6df70adc069c638379a1101594eeefcae40a7bde1c0f6253b91ea3f01eacde4ed8b35a05b95f SHA512 1f5f6a31ad7fcee675958bc63a679052dbad002dd32ba480a47bbc6d54c224e5bc35c54d213c2b7ba60ce624f9efb943896ded2383a50d01575b3fe78ba0d9a0
-AUX cfitsio-4.1.0-system-zlib.patch 2580 BLAKE2B 9c84cf98d1cfafa824c7122e1833927912af0993566750c06066426a08cdb66505ec62a5eab4018e7da7aed2ed55320018c0a0feb25c8a857dbcc4067f9cf49f SHA512 51d5c5edb6f19ad23f9ee91bfc84aba4b2aed4f53740e5721c1a9b68977549bcf00ac38c1dba0a073ce3b4525cc90239e9401de4d03702467efc72b0810dd69f
 AUX cfitsio-4.2.0-pkgconfig.patch 685 BLAKE2B a231cbaa3df98088248cf9064c00bab5c76398a88c4494c7e827e325627e6c3f74b1228bda1bc4cba1fd7a32916121095ee0a07c8a7fa18adfdf85815717ddb0 SHA512 7ce6e934d19cb08bac4002edcad2310e45d073abfece87db8b654b5d4b52930f382f5ef3713412311bf5bb32361a27cb9ee8ccdd012fb23ca3b2bcae9ea8a028
 AUX cfitsio-4.2.0-system-zlib.patch 2589 BLAKE2B 6dbba94f0a3779d18f92478c82a4ff19c6b1bcef7ce72b9a33623b483de8dc99f771f1e1d5868f87b4dd605de94eb3e6ffef53163a88f9300bd9e5a32ba5a2c0 SHA512 a27692620d0c21641d2e4e739c735daac78af200cf8002dd3cf411a7fc14189faca3e5988f00aca1028d06badd4a76353f27b56d40ea9966cb4c9be183f9176d
-DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
-DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa
-DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
 DIST cfitsio-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853
 DIST cfitsio-4.4.0.tar.gz 4278372 BLAKE2B 883a88b08ecddb756a479c361fd0dc4741cffd9b82f311d3cde3f4bede2ac3cb68c8597a5d1cc1350f14b2b145a628fa0ec90754284c0cd4ec1472cb370af01e SHA512 9358b1ed94fdc456cf8c0ddcb346c08f6bc97ee862c31366f3fae2d1be8d5278ffc79da01e41ceebf67ebc831f58bce3551e087c883bbf6b396133110d74b076
-EBUILD cfitsio-3.490.ebuild 1700 BLAKE2B 1993e129785b1191a2fb8c43ccc552b2518b60fbdc6c227fee00c73d938e4608115e077711716c23bd28027e25e04636dae0049d93a2d6773712627fceaa8036 SHA512 5634f5ff6641ccd92edcec1849bdc2fb975471cdab50debebaeccab52fda9814ef61588ad5083a2306a93db7d830045f288094cc245f87d40fb333fc67ec1255
-EBUILD cfitsio-4.0.0.ebuild 1659 BLAKE2B e8c509d9090f2272c0a1545f5f2c301935df0d030ef85cce53c0606b7c0046a3c0fe50e725035cd7107318f645abb6ea6415985e58439bd1ed76f347f1fa3fa0 SHA512 cc578475a999b25decaedff27de330270b2eb1b50085de7e85738b517e8fe51a949e3985e7af9de3163b76b1bf817d997def846dd6be991ba04085b7f18b50ac
-EBUILD cfitsio-4.1.0-r1.ebuild 1879 BLAKE2B 7c48140997a05908921ce35c4c4a9233928a44de433a61d02eb93839e913832bd373eabe094539a3091c137498df4ffb1fa7b6a392560c5551f89475905f0982 SHA512 00f9c639087c62cd052f7ea4890f95c8cee324c821abc3d7c8b701a0c2662c071389f49542d4288d538101d535622dd5d84a773835c9389cc39f83fd16cfe3bd
-EBUILD cfitsio-4.1.0.ebuild 1814 BLAKE2B 76968a8950f95ed2bf537491572a0f8d5dd8a5bc5babf2e2006f99c8d6014009e599101534f936ca5a6a9819fcf2da7dd429a2bc21e5e63c9e5057dfccde352a SHA512 cfdfa3021f4ea8802bf538370b41246f0bba1fef26476dd66d189996dcf6a3337b9a0d250aa46edffb6b7e1f8ac104c88edd0f9591e00dff7e62f71345feada2
+DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7
 EBUILD cfitsio-4.2.0.ebuild 1877 BLAKE2B 3b541f0d4930b42d8ece6acdaa1be4e7c1443f84800b7642ff6dbb9f15125122f7ede4c07034e508d80fce187797faaac4ca370a19ecc99cc91cd37a15e6a485 SHA512 f5694ab2d6666d622427055987d635ec7063ddba754332cc0527a0aaacd6dda0359554ec13d08760f73508e9606fd517d93a571686748bf518cedcbfbb553ba5
 EBUILD cfitsio-4.4.0.ebuild 1836 BLAKE2B 0ec49e9cc08b6179ee846e227b210d3d776fa2f2c551c6ca6658ac43ed503c6afcf8234916da4a51cb92cf1d5221959ad2b132159408049f5e262757b58afe05 SHA512 6bc6c8f1248271cf5754b9354bb8d76a2776fd963aac033c477b8a7be6c900d072f00117091eb9f55a8d7c52ef28500602adb65165d4818d026f7615e8f991f1
+EBUILD cfitsio-4.4.1.ebuild 1836 BLAKE2B 0ec49e9cc08b6179ee846e227b210d3d776fa2f2c551c6ca6658ac43ed503c6afcf8234916da4a51cb92cf1d5221959ad2b132159408049f5e262757b58afe05 SHA512 6bc6c8f1248271cf5754b9354bb8d76a2776fd963aac033c477b8a7be6c900d072f00117091eb9f55a8d7c52ef28500602adb65165d4818d026f7615e8f991f1
 MISC metadata.xml 1032 BLAKE2B 4479a1c6a42796e7effcc1b53ecc30d11e7302140cee2a34f7deaa1270497d0b0add85ddf1ce38223b357a9cac5f11af9039246f41228aca7d73653fd58a0fcf SHA512 ad32ecfbeceae8d768e9fa63386bdf89887d36ca18a68a72965b4f9206d779a26ece545d618540538246be5307c066e823ce55117208533cd9e668a6010222df
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
deleted file mode 100644
index 25baa898457a..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.490.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV%0*}"
-inherit fortran-2 multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-"
-# Bug #803350
-DEPEND="${RDEPEND}
-	<dev-lang/cfortran-20110621
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-	"${FILESDIR}/${P}-system-zlib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid internal cfortran
-	mv cfortran.h cfortran.h.disabled || die
-	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2)
-		$(use_enable curl)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README docs/changes.txt
-
-	dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	dodoc docs/fitsio.pdf
-
-	docinto examples
-	dodoc cookbook.c testprog.c speed.c smem.c
-	dodoc cookbook.f testf77.f
-
-	# Remove static libs
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
deleted file mode 100644
index f3a9749ea4d6..000000000000
--- a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fortran-2 multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-"
-# Bug #803350
-DEPEND="${RDEPEND}
-	<dev-lang/cfortran-20110621
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.490-ldflags.patch"
-	"${FILESDIR}/${P}-system-zlib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid internal cfortran
-	mv cfortran.h cfortran.h.disabled || die
-	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2)
-		$(use_enable curl)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README docs/changes.txt
-
-	dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	dodoc docs/fitsio.pdf
-
-	docinto examples
-	dodoc cookbook.c testprog.c speed.c smem.c
-	dodoc cookbook.f testf77.f
-
-	# Remove static libs
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild
deleted file mode 100644
index 3e3a329bda85..000000000000
--- a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fortran-2 multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-"
-# Bug #803350
-DEPEND="${RDEPEND}
-	<dev-lang/cfortran-20110621
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.490-ldflags.patch"
-	"${FILESDIR}/${P}-system-zlib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid internal cfortran
-	mv cfortran.h cfortran.h.disabled || die
-	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2)
-		$(use_enable curl)
-		$(use_enable threads reentrant)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if use tools ; then
-		emake utils
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc README docs/changes.txt
-
-	dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	dodoc docs/fitsio.pdf
-
-	docinto examples
-	dodoc cookbook.c testprog.c speed.c smem.c
-	dodoc cookbook.f testf77.f
-
-	# https://bugs.gentoo.org/855191
-	if use tools; then
-		rm "${ED}/usr/bin/smem" || die
-	fi
-
-	# Remove static libs
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
deleted file mode 100644
index f63f54fd87e5..000000000000
--- a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fortran-2 multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	tools? ( !dev-util/smem )
-"
-# Bug #803350
-DEPEND="${RDEPEND}
-	<dev-lang/cfortran-20110621
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.490-ldflags.patch"
-	"${FILESDIR}/${P}-system-zlib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid internal cfortran
-	mv cfortran.h cfortran.h.disabled || die
-	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2)
-		$(use_enable curl)
-		$(use_enable threads reentrant)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if use tools ; then
-		emake utils
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc README docs/changes.txt
-
-	dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	dodoc docs/fitsio.pdf
-
-	docinto examples
-	dodoc cookbook.c testprog.c speed.c smem.c
-	dodoc cookbook.f testf77.f
-
-	# Remove static libs
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild
new file mode 100644
index 000000000000..a27f43704cab
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib fortran-2
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+"
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+"
+# Bug #803350
+DEPEND="
+	${RDEPEND}
+	<dev-lang/cfortran-20110621
+"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! grep -q 'CFITSIO_SONAME,10' configure.in; then
+		die "Update subslot!"
+	fi
+
+	# fix libdir & sync SONAME to configure.in
+	sed -e 's:lib/:${CMAKE_INSTALL_LIBDIR}/:' \
+		-e "/SOVERSION/s:VERSION :VERSION ${SLOT#0/}.:" \
+		-e "s:SOVERSION :SOVERSION ${SLOT#0/}.:" \
+		-i CMakeLists.txt || die
+
+	# Avoid internal cfortran
+	rm cfortran.h || die
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# used for .pc file
+		-DLIB_SUFFIX=${libdir#lib}
+
+		-DUSE_BZIP2=$(usex bzip2)
+		-DUSE_CURL=$(usex curl)
+		-DUSE_PTHREADS=$(usex threads)
+		-DUSE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DUSE_SSSE3=$(usex cpu_flags_x86_ssse3)
+
+		-DTESTS=$(usex test)
+		-DUTILS=$(multilib_native_usex tools)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc README.md docs/changes.txt docs/*.pdf
+
+	docinto examples
+	dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c}
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
deleted file mode 100644
index 37b47c7b820f..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
---- a/cfitsio.pc.in	2019-05-08 17:34:49.000000000 +0200
-+++ b/cfitsio.pc.in	2019-08-01 15:56:52.064310329 +0200
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
- 
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
--Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs: -L${libdir} -lcfitsio
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
deleted file mode 100644
index 6ade40ce62f3..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur a/Makefile.in b/Makefile.in
---- a/Makefile.in	2019-05-08 17:34:50.000000000 +0200
-+++ b/Makefile.in	2019-08-01 15:52:57.829760351 +0200
-@@ -68,9 +68,7 @@
- 		pliocomp.c fits_hcompress.c fits_hdecompress.c \
- 		simplerng.c @GSIFTP_SRC@
- 
--ZLIB_SOURCES =	zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
--		zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
--		zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
-+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
- 
- SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
- 
-@@ -103,7 +101,7 @@
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
- 
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
--		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,28 +138,28 @@
- 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
- 
- smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
- 
- testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- eval:		# Rebuild eval_* files from flex/bison source
- 		${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
deleted file mode 100644
index 4d743f2d32d9..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cfitsio.pc.in b/cfitsio.pc.in
-index 7cc25c6..95fb9d0 100644
---- a/cfitsio.pc.in
-+++ b/cfitsio.pc.in
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
- 
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
- Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch
deleted file mode 100644
index f26f3d431505..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d607eec..b646458 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -102,7 +102,7 @@ lib${PACKAGE}.a:	${OBJECTS}
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
- 
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
--		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,28 +140,28 @@ swapproc.o:	swapproc.c
- 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
- 
- smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
- 
- testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- eval:		# Rebuild eval_* files from flex/bison source
- 		${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
deleted file mode 100644
index 63502b77f756..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
---- a/cfitsio.pc.in	2022-05-26 17:25:47.094287274 +0200
-+++ b/cfitsio.pc.in	2022-05-26 17:30:27.552413663 +0200
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
- 
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
- Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
deleted file mode 100644
index 6d740074857c..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur a/Makefile.in b/Makefile.in
---- a/Makefile.in	2022-05-26 17:33:37.986215858 +0200
-+++ b/Makefile.in	2022-05-26 17:34:27.580944957 +0200
-@@ -102,7 +102,7 @@
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
- 
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
--		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,31 +140,31 @@
- 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
- 
- smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
- 
- testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
--		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- testf77:	testf77.o lib${PACKAGE}.a ${OBJECTS}
--		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
- 
- eval:		# Rebuild eval_* files from flex/bison source
- 		${FLEX} -t eval.l > eval_l.c1