gentoo auto-resync : 07:07:2024 - 12:24:46

7 files changed, 2 insertions, 259 deletions

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index c07d3ee342fa..69d7f53c7c09 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,10 +1,3 @@
-AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2
-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-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853
-DIST cfitsio-4.4.0.tar.gz 4278372 BLAKE2B 883a88b08ecddb756a479c361fd0dc4741cffd9b82f311d3cde3f4bede2ac3cb68c8597a5d1cc1350f14b2b145a628fa0ec90754284c0cd4ec1472cb370af01e SHA512 9358b1ed94fdc456cf8c0ddcb346c08f6bc97ee862c31366f3fae2d1be8d5278ffc79da01e41ceebf67ebc831f58bce3551e087c883bbf6b396133110d74b076
 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 1834 BLAKE2B a2b7edef58c55d580bda02eeacfbf1b6fcaf5ea40009c55d11531bf8271b34718f31692c2f80360699868a4ca5b55ed693f58eaaf5a2b5b9ef8366e90e3cd0f9 SHA512 0080082da08eb178ad80b5cdf45d5b3f6b1b76d82ed8dc9136b5d663c34427a3dffcbb2f84ec69a42f720a9c9970774a258604a0c893b7dcc1a75d2d1f367b11
+EBUILD cfitsio-4.4.1.ebuild 1833 BLAKE2B defdf2cbdede916f77d0851ef686eb5756896a5caef1c383260624b9c00f3a01f6a7ca25c2d9000fe062c281150c59bd9407fa17d0f25f8c8337a4b57124ab82 SHA512 59c4adef378d805734499999e82b2e9db022e159b6bdf2f1d4e86997cd62fa8fee842bafc3bb0d7deeef6fd3b91f606118b80f94457159226056e2fe82ab41d5
 MISC metadata.xml 1032 BLAKE2B 4479a1c6a42796e7effcc1b53ecc30d11e7302140cee2a34f7deaa1270497d0b0add85ddf1ce38223b357a9cac5f11af9039246f41228aca7d73653fd58a0fcf SHA512 ad32ecfbeceae8d768e9fa63386bdf89887d36ca18a68a72965b4f9206d779a26ece545d618540538246be5307c066e823ce55117208533cd9e668a6010222df
diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild
deleted file mode 100644
index b89a0735a841..000000000000
--- a/sci-libs/cfitsio/cfitsio-4.2.0.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/10"
-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.4.0.ebuild b/sci-libs/cfitsio/cfitsio-4.4.0.ebuild
deleted file mode 100644
index a27f43704cab..000000000000
--- a/sci-libs/cfitsio/cfitsio-4.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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/cfitsio-4.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild
index 6fb7875c3962..bd4c4375ffd6 100644
--- a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
 
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
deleted file mode 100644
index 4b04fb9cc4fe..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure	2018-05-09 21:16:00.000000000 +0200
-+++ b/configure	2018-05-23 17:17:18.452431657 +0200
-@@ -4215,8 +4215,8 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--LDFLAGS="$CFLAGS"
--LDFLAGS_BIN="$LDFLAGS"
-+# LDFLAGS="$CFLAGS"
-+LDFLAGS_BIN="$CFLAGS"
- 
- if test "x$FC" = "xnone" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5
diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
deleted file mode 100644
index 9ec614616552..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/cfitsio.pc.cmake b/cfitsio.pc.cmake
---- a/cfitsio.pc.cmake	2022-10-31 19:40:23.000000000 +0100
-+++ b/cfitsio.pc.cmake	2022-12-14 23:35:53.572102437 +0100
-@@ -1,12 +1,12 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@/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: @PKG_CONFIG_LIBS@ -lm
--Cflags: -I${includedir}
-+Libs.private: @PKG_CONFIG_LIBS@ -lm -z
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch
deleted file mode 100644
index fab375507f83..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur a/Makefile.in b/Makefile.in
---- a/Makefile.in	2022-10-31 19:40:23.000000000 +0100
-+++ b/Makefile.in	2022-12-14 23:37:10.785099554 +0100
-@@ -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} $@; \
-@@ -142,31 +142,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}
- 
- # Tested with bison 3.8 and flex 2.6.4
- eval:		# Rebuild eval_* files from flex/bison source