commit: ad5e00411c3abb0b4c7ceaa2400802a38221ec77 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 03:05:24 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Oct 1 03:08:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5e0041
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.5.0-r1.ebuild | 73 --------------------- sci-libs/cfitsio/cfitsio-4.5.0.ebuild | 71 -------------------- sci-libs/cfitsio/cfitsio-4.6.0.ebuild | 75 ---------------------- .../files/cfitsio-4.5.0-rename-nullptr.patch | 51 --------------- 5 files changed, 272 deletions(-) diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 959e4f8b8481..82542ff74559 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,3 +1 @@ -DIST cfitsio-4.5.0.tar.gz 4648097 BLAKE2B 5e0e09a3e6f43ce00bb5e5dd90e88c1aa2a873b407f3156147b064904ab341da219e69dc2a763e6b02eea0392a78e0ce74c15f921054bf72cac9b6e425765f99 SHA512 03746bf49cfcd97991be54f3e4dd51fb45c7b3a75f581dc6ab9ee5726a342dc11b651667807fd67e5318576d9b15e3580dd62ceab02fd684feff7ee6bb2edc7c -DIST cfitsio-4.6.0.tar.gz 4645987 BLAKE2B 7e83edff7f143a622e65f6d24e088aa6c5fbbd1b978c75cb0761bdbefeaeccc6b257abd9a586f8b140eb7a7b2a26e5d568a6f4cacc450a792aea8a3337286e2e SHA512 1d224401ceeaee5e879b81eca7eb200b47104f93ea33ccf83fb7b068753a72ad36658c371470b77860036fb5b731dedecd5b5df0c3745f0ef7cc3809eb84aea3 DIST cfitsio-4.6.2.tar.gz 4680361 BLAKE2B dc270e7db86626629c3b281dd037903207902e9fa1140cea04d6aba721cd6853d25b386214691aee82ac3b9358cc747242057d0b8b7fb58eade1ada48f75f324 SHA512 fb987b28b56e686fee80bb9cef87e8bb0b5094c425008b12fa3748c772479995c38cc16a15ba662c9ca9d5b295cfd49392bf81512446e1ecbea40760a065f091 diff --git a/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild deleted file mode 100644 index c50383b46670..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2025 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-r1" -KEYWORDS="~alpha ~amd64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl test tools" -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 -" - -PATCHES=( "${FILESDIR}/${P}-rename-nullptr.patch" ) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # fix libdir - sed -e 's:lib/::' -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=ON - # just appending CFLAGS - -DUSE_SSE2=OFF - -DUSE_SSSE3=OFF - - -DTESTS=$(usex test) - -DUTILS=$(multilib_native_usex tools) - ) - cmake_src_configure -} - -multilib_src_install_all() { - dodoc README.md 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.5.0.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0.ebuild deleted file mode 100644 index 4b506cba5d17..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 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-r1" -KEYWORDS="~alpha amd64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl test tools" -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 - - # fix libdir - sed -e 's:lib/::' -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=ON - # just appending CFLAGS - -DUSE_SSE2=OFF - -DUSE_SSSE3=OFF - - -DTESTS=$(usex test) - -DUTILS=$(multilib_native_usex tools) - ) - cmake_src_configure -} - -multilib_src_install_all() { - dodoc README.md 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.6.0.ebuild b/sci-libs/cfitsio/cfitsio-4.6.0.ebuild deleted file mode 100644 index e3005fc78611..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.6.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2025 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-r1" -KEYWORDS="~alpha ~amd64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl test tools" -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 - - # I hate CMake - sed -i -e 's:lib/:${CMAKE_INSTALL_LIBDIR}/:' \ - -e 's:lib$:${CMAKE_INSTALL_LIBDIR}:' CMakeLists.txt || die - - # Avoid internal cfortran - rm cfortran.h || die -} - -multilib_src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - # used for .pc file - # note that we need to set them, as otherwise .pc file will mess up - # compiler command-line - -DLIB_DESTINATION="${EPREFIX}/usr/$(get_libdir)" - -DINCLUDE_INSTALL_DIR="${EPREFIX}/usr/include" - - -DUSE_BZIP2=$(usex bzip2) - -DUSE_CURL=$(usex curl) - -DUSE_PTHREADS=ON - # just appending CFLAGS - -DUSE_SSE2=OFF - -DUSE_SSSE3=OFF - - -DTESTS=$(usex test) - -DUTILS=$(multilib_native_usex tools) - ) - cmake_src_configure -} - -multilib_src_install_all() { - dodoc README.md 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-4.5.0-rename-nullptr.patch b/sci-libs/cfitsio/files/cfitsio-4.5.0-rename-nullptr.patch deleted file mode 100644 index 6281d7f7e324..000000000000 --- a/sci-libs/cfitsio/files/cfitsio-4.5.0-rename-nullptr.patch +++ /dev/null @@ -1,51 +0,0 @@ -Nullptr is reserved keyword in C23. Rename to something that describes usage better -https://bugs.gentoo.org/944747 ---- a/putcol.c -+++ b/putcol.c -@@ -1226,7 +1226,7 @@ - long rept, rowrept, width, tnull, naxes[9] = {1,1,1,1,1,1,1,1,1}, groups; - double zeros = 0.; - char message[FLEN_ERRMSG], keyname[FLEN_KEYWORD], nullstr[FLEN_VALUE]; -- char **stringptr, *nullptr, *cptr; -+ char **stringptr, *ptr_to_null, *cptr; - - if (*status > 0) - return(*status); -@@ -2081,24 +2081,24 @@ - { - stringptr = cols[jj].array; - dataptr = stringptr + 1; -- nullptr = *stringptr; -+ ptr_to_null = *stringptr; - nbytes = 2; - } - else - { - dataptr = (char *) cols[jj].array + col[jj].nullsize; -- nullptr = (char *) cols[jj].array; -+ ptr_to_null = (char *) cols[jj].array; - nbytes = col[jj].nullsize; - } - -- if (memcmp(nullptr, &zeros, nbytes) ) -+ if (memcmp(ptr_to_null, &zeros, nbytes) ) - { - /* null value flag not zero; must check for and write nulls */ - if (hdutype == IMAGE_HDU) - { - if (ffppn(cols[jj].fptr, cols[jj].datatype, - felement, cols[jj].repeat * ntodo, dataptr, -- nullptr, &tstatus) > 0) -+ ptr_to_null, &tstatus) > 0) - break; - } - else -@@ -2113,7 +2113,7 @@ - - if (ffpcn(cols[jj].fptr, cols[jj].datatype, cols[jj].colnum, frow, - felement, cols[jj].repeat * ntodo, dataptr, -- nullptr, &tstatus) > 0) -+ ptr_to_null, &tstatus) > 0) - break; - } - }
