From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- sci-libs/cfitsio/Manifest | 9 ++- sci-libs/cfitsio/cfitsio-3.360.ebuild | 11 ++-- sci-libs/cfitsio/cfitsio-3.410.ebuild | 10 +-- sci-libs/cfitsio/cfitsio-3.490.ebuild | 74 ++++++++++++++++++++++ sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch | 14 ++++ .../cfitsio/files/cfitsio-3.490-pkgconfig.patch | 20 ++++++ .../cfitsio/files/cfitsio-3.490-system-zlib.patch | 60 ++++++++++++++++++ 7 files changed, 186 insertions(+), 12 deletions(-) create mode 100644 sci-libs/cfitsio/cfitsio-3.490.ebuild create mode 100644 sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch create mode 100644 sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch create mode 100644 sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch (limited to 'sci-libs/cfitsio') diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 044f58bc95c2..149ffa3a2792 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,5 +1,10 @@ +AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2 +AUX cfitsio-3.490-pkgconfig.patch 613 BLAKE2B acdaedb24b8a06019346b44eade4cf9f8cdce93578a08354dab61bfa5e7979fd22ab5214676d0f08a8dde5bb70b10c0ec54527d25b73892aa6bbbe935614ee92 SHA512 46c2f7ae36529c4d3afc17afe2f22b2f21b1d5ecfa1d460fca8a95335bf94017c322412da67b57cd052ab98701e5f7776845fe30171cb400f97e2b4411497387 +AUX cfitsio-3.490-system-zlib.patch 2816 BLAKE2B eb16c43cc5be95877424469eeebc085a46fb37e78d0b2fb48db72d71c2bb05d5b85eaf6d7341ed07da25858765cb9902e1dcf8ef33f3ab42b191d2b7689976ed SHA512 4f05a0a35d6bcdc03676d9142d2cc46dd4df69aff4759464c2dc441753e7e3085c756059d2218e9deef9da91c27e760c0f73562bbc02b5a73e0044f47560ded8 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd -EBUILD cfitsio-3.360.ebuild 1464 BLAKE2B 124a1331c7a494995e8cc91f6f5a0c2a6b9c6e71a40556b00162c40330bdb366ce21a70cde10817cecf0a73aa7d139f2e65aae1c40c1fab5ecb9fb9a98d49b11 SHA512 270f4fe29b970cc87a9ba6bda72e00df8667a80efc8b8b87e3827c1e46744738f9e7700c5b2b0f462cf929454a84f8270f56254e728968d2622d68b3c5ff3bcf -EBUILD cfitsio-3.410.ebuild 1597 BLAKE2B bd5a91bb4b2c02977691b606835c8397d05090147402bb5f2f9abe3cdc1c233e6f961c517c99a689033fdc02cb72a050345ed46e0414ba683f04f3565468fe69 SHA512 6cb2c395fbe830cdf0b1a3f2fc79c0d0e4ae2923de95f7b24fed1cfb1cb23809bd041adca03316659b95e2af7b4604b4bdd39b5b51a930af5719e57796dbf7ff +DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 +EBUILD cfitsio-3.360.ebuild 1433 BLAKE2B 79dc499048a4c08bec4fe8d11a99ea5bf064716460ae2a80530ca8dd073fc0f00647edacb3f3206cece007e34a3ead466e3d2e1264c6429c9de888a3c3c61a19 SHA512 09c143480ef52b7d979aca2b76b7fa127eba383636e186bcc4d811ec03905a01bba9c018788bdbd2d8864e1746c71f80853de4fcfca45e17f29f73bc819adc9c +EBUILD cfitsio-3.410.ebuild 1565 BLAKE2B 72d14e52ecd130a4db75b36f673e6b18b471a24ef508e1b91d8cdf624bdb134d874c4514aa47d7eecf280e9d7e2e004e1d7361c0c60e10669ef95081f805e132 SHA512 31777199cabaad85b790099a21b777e2b0edab4dc113617e8e6d7e253f9bc7d904a1acbca022e1c680edc94a244c3a1e8c710d4054953a874be11abc2e399c47 +EBUILD cfitsio-3.490.ebuild 1687 BLAKE2B 21c2aad5ba9e9de0f34a1d7bd7622bcfa2134025e91cc96e32a2cc368d7f1f1a3104c483fe50da4e7ec8427325520ae850174dc0aa692a41ed4544c879a33afa SHA512 be01b1dc328ffbc2489e9901f8a69d56502e21ef37f7952f57f174713b2698e5dedda3bd8c14d2fdfd939383f6c5f79c33471b61c5d3286f4a666362a1d19c43 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild index 365477171540..d281612a65bf 100644 --- a/sci-libs/cfitsio/cfitsio-3.360.ebuild +++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" LICENSE="MIT" SLOT="0/1" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" IUSE="doc examples fortran static-libs +tools threads" RDEPEND="sys-libs/zlib" @@ -48,9 +48,10 @@ src_install() { use fortran && dodoc docs/fitsio.doc use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf use doc && use fortran && dodoc docs/fitsio.pdf + if use examples; then - insinto /usr/share/doc/${PF}/examples - doins cookbook.c testprog.c speed.c smem.c - use fortran && doins cookbook.f testf77.f + docinto examples + dodoc cookbook.c testprog.c speed.c smem.c + use fortran && dodoc cookbook.f testf77.f fi } diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild index 640d3bb018f4..2ff8d4bbe26e 100644 --- a/sci-libs/cfitsio/cfitsio-3.410.ebuild +++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" LICENSE="MIT" SLOT="0/5" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" IUSE="bzip2 doc examples fortran static-libs +tools threads" RDEPEND=" @@ -50,9 +50,9 @@ multilib_src_install_all() { use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf use doc && use fortran && dodoc docs/fitsio.pdf if use examples; then - insinto /usr/share/doc/${PF}/examples - doins cookbook.c testprog.c speed.c smem.c - use fortran && doins cookbook.f testf77.f + docinto examples + dodoc cookbook.c testprog.c speed.c smem.c + use fortran && dodoc cookbook.f testf77.f fi prune_libtool_files --all } diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild new file mode 100644 index 000000000000..84e2489d6d5c --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 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="http://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 ~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}] ) +" +DEPEND="${RDEPEND} + dev-lang/cfortran +" + +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/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch new file mode 100644 index 000000000000..4b04fb9cc4fe --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch @@ -0,0 +1,14 @@ +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-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch new file mode 100644 index 000000000000..37b47c7b820f --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..6ade40ce62f3 --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch @@ -0,0 +1,60 @@ +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 -- cgit v1.2.3