| 1 |
commit: 1a78dc37e8d87a8d3bad4a9087843ec813f9f217 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 2 19:20:19 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 20:30:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a78dc37 |
| 7 |
|
| 8 |
sci-libs/cfitsio: 3.490 version bump |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/687860 |
| 11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-libs/cfitsio/Manifest | 2 +- |
| 15 |
.../{cfitsio-3.480.ebuild => cfitsio-3.490.ebuild} | 35 +++++++------ |
| 16 |
sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch | 14 +++++ |
| 17 |
.../cfitsio/files/cfitsio-3.490-pkgconfig.patch | 20 ++++++++ |
| 18 |
.../cfitsio/files/cfitsio-3.490-system-zlib.patch | 60 ++++++++++++++++++++++ |
| 19 |
5 files changed, 114 insertions(+), 17 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest |
| 22 |
index d9d1cb2960a..d4be6d38173 100644 |
| 23 |
--- a/sci-libs/cfitsio/Manifest |
| 24 |
+++ b/sci-libs/cfitsio/Manifest |
| 25 |
@@ -1,3 +1,3 @@ |
| 26 |
DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 |
| 27 |
DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd |
| 28 |
-DIST cfitsio-3.48.tar.gz 4928169 BLAKE2B 86e2af3f767c9572c07d1b81138973f81f0ad62a862fb2e457de363a552c17990aacd4f931f233f2cdbbe41c10dac3aa1bfb46220b34fc4407fea4ac01a46132 SHA512 08a13931726b0ee15bd4e2ad6dd4debb8268f3b0bc33adadec5c6a29295dd536bcccb3cc949721c6cebac6f43b6118e5e38332ac0ba8a07a43553416d8debae5 |
| 29 |
+DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 |
| 30 |
|
| 31 |
diff --git a/sci-libs/cfitsio/cfitsio-3.480.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild |
| 32 |
similarity index 70% |
| 33 |
rename from sci-libs/cfitsio/cfitsio-3.480.ebuild |
| 34 |
rename to sci-libs/cfitsio/cfitsio-3.490.ebuild |
| 35 |
index 53eb483eab3..419ec07c908 100644 |
| 36 |
--- a/sci-libs/cfitsio/cfitsio-3.480.ebuild |
| 37 |
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild |
| 38 |
@@ -1,38 +1,39 @@ |
| 39 |
-# Copyright 1999-2020 Gentoo Authors |
| 40 |
+# Copyright 1999-2021 Gentoo Authors |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
EAPI=7 |
| 44 |
|
| 45 |
+MY_P="${PN}-${PV%0*}" |
| 46 |
inherit fortran-2 multilib-minimal |
| 47 |
|
| 48 |
-# Upstream call this release 3.480, but drop the 0 in the tarball filename |
| 49 |
-MY_PV="3.48" |
| 50 |
-MY_P="${PN}-${MY_PV}" |
| 51 |
- |
| 52 |
DESCRIPTION="C and Fortran library for manipulating FITS files" |
| 53 |
HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" |
| 54 |
SRC_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz" |
| 55 |
+S="${WORKDIR}/${MY_P}" |
| 56 |
|
| 57 |
LICENSE="ISC" |
| 58 |
-SLOT="0/8" |
| 59 |
+SLOT="0/9" |
| 60 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" |
| 61 |
-IUSE="bzip2 cpu_flags_x86_sse2 cpu_flags_x86_ssse3 curl" |
| 62 |
+IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3" |
| 63 |
|
| 64 |
BDEPEND=" |
| 65 |
sys-devel/bison |
| 66 |
sys-devel/flex |
| 67 |
" |
| 68 |
RDEPEND=" |
| 69 |
- net-misc/curl[${MULTILIB_USEDEP}] |
| 70 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 71 |
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
| 72 |
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) |
| 73 |
" |
| 74 |
-DEPEND=" |
| 75 |
- ${RDEPEND} |
| 76 |
+DEPEND="${RDEPEND} |
| 77 |
dev-lang/cfortran |
| 78 |
" |
| 79 |
|
| 80 |
-S="${WORKDIR}/${MY_P}" |
| 81 |
+PATCHES=( |
| 82 |
+ "${FILESDIR}/${P}-ldflags.patch" |
| 83 |
+ "${FILESDIR}/${P}-system-zlib.patch" |
| 84 |
+ "${FILESDIR}/${P}-pkgconfig.patch" |
| 85 |
+) |
| 86 |
|
| 87 |
pkg_setup() { |
| 88 |
fortran-2_pkg_setup |
| 89 |
@@ -42,18 +43,20 @@ src_prepare() { |
| 90 |
default |
| 91 |
|
| 92 |
# Avoid internal cfortran |
| 93 |
- mv cfortran.h cfortran.h.disabled |
| 94 |
+ mv cfortran.h cfortran.h.disabled || die |
| 95 |
ln -s "${EPREFIX}"/usr/include/cfortran.h . || die |
| 96 |
|
| 97 |
multilib_copy_sources |
| 98 |
} |
| 99 |
|
| 100 |
multilib_src_configure() { |
| 101 |
- ECONF_SOURCE="${S}" econf \ |
| 102 |
- $(use_with bzip2) \ |
| 103 |
- $(use_enable curl) \ |
| 104 |
- $(use_enable cpu_flags_x86_sse2 sse2) \ |
| 105 |
+ local myeconfargs=( |
| 106 |
+ $(use_with bzip2) |
| 107 |
+ $(use_enable curl) |
| 108 |
+ $(use_enable cpu_flags_x86_sse2 sse2) |
| 109 |
$(use_enable cpu_flags_x86_ssse3 ssse3) |
| 110 |
+ ) |
| 111 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 112 |
} |
| 113 |
|
| 114 |
multilib_src_install_all() { |
| 115 |
|
| 116 |
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch |
| 117 |
new file mode 100644 |
| 118 |
index 00000000000..4b04fb9cc4f |
| 119 |
--- /dev/null |
| 120 |
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch |
| 121 |
@@ -0,0 +1,14 @@ |
| 122 |
+diff -Naur a/configure b/configure |
| 123 |
+--- a/configure 2018-05-09 21:16:00.000000000 +0200 |
| 124 |
++++ b/configure 2018-05-23 17:17:18.452431657 +0200 |
| 125 |
+@@ -4215,8 +4215,8 @@ |
| 126 |
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| 127 |
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 128 |
+ |
| 129 |
+-LDFLAGS="$CFLAGS" |
| 130 |
+-LDFLAGS_BIN="$LDFLAGS" |
| 131 |
++# LDFLAGS="$CFLAGS" |
| 132 |
++LDFLAGS_BIN="$CFLAGS" |
| 133 |
+ |
| 134 |
+ if test "x$FC" = "xnone" ; then |
| 135 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 |
| 136 |
|
| 137 |
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch |
| 138 |
new file mode 100644 |
| 139 |
index 00000000000..37b47c7b820 |
| 140 |
--- /dev/null |
| 141 |
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch |
| 142 |
@@ -0,0 +1,20 @@ |
| 143 |
+diff -ur a/cfitsio.pc.in b/cfitsio.pc.in |
| 144 |
+--- a/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200 |
| 145 |
++++ b/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200 |
| 146 |
+@@ -1,12 +1,12 @@ |
| 147 |
+ prefix=@prefix@ |
| 148 |
+ exec_prefix=@exec_prefix@ |
| 149 |
+ libdir=@libdir@ |
| 150 |
+-includedir=@includedir@ |
| 151 |
++includedir=@includedir@/cfitsio |
| 152 |
+ |
| 153 |
+ Name: cfitsio |
| 154 |
+ Description: FITS File Subroutine Library |
| 155 |
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/ |
| 156 |
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@ |
| 157 |
+-Libs: -L${libdir} -lcfitsio |
| 158 |
+-Libs.private: -lm @LIBS@ |
| 159 |
+-Cflags: -I${includedir} |
| 160 |
++Libs: -L${libdir} -lcfitsio |
| 161 |
++Libs.private: -lm -lz @LIBS@ |
| 162 |
++Cflags: -D_REENTRANT -I${includedir} |
| 163 |
|
| 164 |
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch |
| 165 |
new file mode 100644 |
| 166 |
index 00000000000..6ade40ce62f |
| 167 |
--- /dev/null |
| 168 |
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch |
| 169 |
@@ -0,0 +1,60 @@ |
| 170 |
+diff -ur a/Makefile.in b/Makefile.in |
| 171 |
+--- a/Makefile.in 2019-05-08 17:34:50.000000000 +0200 |
| 172 |
++++ b/Makefile.in 2019-08-01 15:52:57.829760351 +0200 |
| 173 |
+@@ -68,9 +68,7 @@ |
| 174 |
+ pliocomp.c fits_hcompress.c fits_hdecompress.c \ |
| 175 |
+ simplerng.c @GSIFTP_SRC@ |
| 176 |
+ |
| 177 |
+-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \ |
| 178 |
+- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \ |
| 179 |
+- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c |
| 180 |
++ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c |
| 181 |
+ |
| 182 |
+ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ |
| 183 |
+ |
| 184 |
+@@ -103,7 +101,7 @@ |
| 185 |
+ shared: lib${PACKAGE}${SHLIB_SUFFIX} |
| 186 |
+ |
| 187 |
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} |
| 188 |
+- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} |
| 189 |
++ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} |
| 190 |
+ @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ |
| 191 |
+ ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ |
| 192 |
+ ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ |
| 193 |
+@@ -140,28 +138,28 @@ |
| 194 |
+ ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< |
| 195 |
+ |
| 196 |
+ smem: smem.o lib${PACKAGE}.a ${OBJECTS} |
| 197 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm |
| 198 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz |
| 199 |
+ |
| 200 |
+ testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} |
| 201 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} |
| 202 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 203 |
+ |
| 204 |
+ fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} |
| 205 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} |
| 206 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 207 |
+ |
| 208 |
+ funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} |
| 209 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} |
| 210 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 211 |
+ |
| 212 |
+ fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} |
| 213 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} |
| 214 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 215 |
+ |
| 216 |
+ speed: speed.o lib${PACKAGE}.a ${OBJECTS} |
| 217 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} |
| 218 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 219 |
+ |
| 220 |
+ imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} |
| 221 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} |
| 222 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 223 |
+ |
| 224 |
+ cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} |
| 225 |
+- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} |
| 226 |
++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} |
| 227 |
+ |
| 228 |
+ eval: # Rebuild eval_* files from flex/bison source |
| 229 |
+ ${FLEX} -t eval.l > eval_l.c1 |
Archives