From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/
Date: Wed, 19 Jun 2024 04:36:25 +0000 (UTC) [thread overview]
Message-ID: <1718771244.d71a074b304a386ccd43dbb94c149f6488fb6790.mgorny@gentoo> (raw)
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
next reply other threads:[~2024-06-19 4:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 4:36 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-06 8:33 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cfitsio/, sci-libs/cfitsio/files/ Michał Górny
2023-01-29 16:31 Andrew Ammerlaan
2022-06-10 10:18 Andrew Ammerlaan
2022-03-01 13:07 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1718771244.d71a074b304a386ccd43dbb94c149f6488fb6790.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox