[gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
@ 2022-03-01 13:07 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-03-01 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0ddca19456af9c3dfeecf1e4f1ea8cf87763d6ed
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 13:07:04 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 13:07:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddca194

sci-libs/cfitsio: add version 4.0.0

Co-authored-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
Closes: https://bugs.gentoo.org/828444
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/cfitsio/Manifest                          |  1 +
 sci-libs/cfitsio/cfitsio-4.0.0.ebuild              | 73 ++++++++++++++++++++++
 .../cfitsio/files/cfitsio-4.0.0-pkgconfig.patch    | 20 ++++++
 .../cfitsio/files/cfitsio-4.0.0-system-zlib.patch  | 50 +++++++++++++++
 4 files changed, 144 insertions(+)

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 470fffa01b2d..e716f04e6788 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1 +1,2 @@
 DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
+DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa

diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
new file mode 100644
index 000000000000..33e1c7b7b075
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 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 ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+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/files/cfitsio-4.0.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
new file mode 100644
index 000000000000..4d743f2d32d9
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..f26f3d431505
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch
@@ -0,0 +1,50 @@
+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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
@ 2022-06-10 10:18 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-06-10 10:18 UTC (permalink / raw
  To: gentoo-commits

commit:     3f738f05c5eeb714d18dfe21320c446d988fbabf
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 10:17:10 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 10:18:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f738f05

sci-libs/cfitsio: add 4.1.0

Co-authored-by: Alexander Wessel <flexx <AT> chello.at>
Closes: https://bugs.gentoo.org/847595
Signed-off-by Alexander Wessel <flexx <AT> chello.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/cfitsio/Manifest                          |  1 +
 sci-libs/cfitsio/cfitsio-4.1.0.ebuild              | 82 ++++++++++++++++++++++
 .../cfitsio/files/cfitsio-4.1.0-pkgconfig.patch    | 19 +++++
 .../cfitsio/files/cfitsio-4.1.0-system-zlib.patch  | 53 ++++++++++++++
 sci-libs/cfitsio/metadata.xml                      |  5 ++
 5 files changed, 160 insertions(+)

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index e716f04e6788..2482f16f036b 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
new file mode 100644
index 000000000000..4a55f5bf63bc
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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 ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+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
+
+	# Remove static libs
+	find "${ED}" -name '*.a' -delete || die
+}

diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
new file mode 100644
index 000000000000..63502b77f756
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..6d740074857c
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
@@ -0,0 +1,53 @@
+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

diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
index 7524e3a95041..47dcef290728 100644
--- a/sci-libs/cfitsio/metadata.xml
+++ b/sci-libs/cfitsio/metadata.xml
@@ -5,6 +5,11 @@
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>
+  <use>
+    <flag name="tools">
+      Build optional utilities (cookbook fitscopy imcopy smem speed testprog fpack funpack)
+    </flag>
+  </use>
   <longdescription lang="en">
   CFITSIO is a library of C and Fortran subroutines for reading and
   writing data files in FITS (Flexible Image Transport System) data


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
@ 2023-01-29 16:31 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2023-01-29 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7221fe6d2b5ca1124f8616cd99ef44b49230ae43
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Dec 14 22:43:29 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:29:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7221fe6d

sci-libs/cfitsio: add 4.2.0

Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28666
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/cfitsio/Manifest                          |  1 +
 sci-libs/cfitsio/cfitsio-4.2.0.ebuild              | 87 ++++++++++++++++++++++
 .../cfitsio/files/cfitsio-4.2.0-pkgconfig.patch    | 19 +++++
 .../cfitsio/files/cfitsio-4.2.0-system-zlib.patch  | 53 +++++++++++++
 4 files changed, 160 insertions(+)

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 2482f16f036b..64031fa708e5 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild
new file mode 100644
index 000000000000..f3ec0c5b3190
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 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 ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+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/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
new file mode 100644
index 000000000000..9ec614616552
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..fab375507f83
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch
@@ -0,0 +1,53 @@
+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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
@ 2024-06-19  4:36 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-06-19  4:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d71a074b304a386ccd43dbb94c149f6488fb6790
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 04:27:24 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 04:27:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71a074b

sci-libs/cfitsio: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/cfitsio/Manifest                          |  3 -
 sci-libs/cfitsio/cfitsio-3.490.ebuild              | 75 -------------------
 sci-libs/cfitsio/cfitsio-4.0.0.ebuild              | 73 ------------------
 sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild           | 87 ----------------------
 sci-libs/cfitsio/cfitsio-4.1.0.ebuild              | 83 ---------------------
 .../cfitsio/files/cfitsio-3.490-pkgconfig.patch    | 20 -----
 .../cfitsio/files/cfitsio-3.490-system-zlib.patch  | 60 ---------------
 .../cfitsio/files/cfitsio-4.0.0-pkgconfig.patch    | 20 -----
 .../cfitsio/files/cfitsio-4.0.0-system-zlib.patch  | 50 -------------
 .../cfitsio/files/cfitsio-4.1.0-pkgconfig.patch    | 19 -----
 .../cfitsio/files/cfitsio-4.1.0-system-zlib.patch  | 53 -------------
 11 files changed, 543 deletions(-)

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 7fb4e4d0d638..645f49c067d5 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,5 +1,2 @@
-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

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/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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
@ 2024-07-06  8:33 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-07-06  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d263cd2fcf4bae2c8cb1efc5e0823b9985335394
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 08:16:27 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:33:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d263cd2f

sci-libs/cfitsio: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/cfitsio/Manifest                          |  2 -
 sci-libs/cfitsio/cfitsio-4.2.0.ebuild              | 87 ----------------------
 sci-libs/cfitsio/cfitsio-4.4.0.ebuild              | 77 -------------------
 sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch | 14 ----
 .../cfitsio/files/cfitsio-4.2.0-pkgconfig.patch    | 19 -----
 .../cfitsio/files/cfitsio-4.2.0-system-zlib.patch  | 53 -------------
 6 files changed, 252 deletions(-)

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index abce05c33554..e8ce87e899aa 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,3 +1 @@
-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

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/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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-07-06  8:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-01 13:07 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-06-10 10:18 Andrew Ammerlaan
2023-01-29 16:31 Andrew Ammerlaan
2024-06-19  4:36 Michał Górny
2024-07-06  8:33 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox