summaryrefslogtreecommitdiff
path: root/sci-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-06 07:21:11 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-06 07:21:11 +0100
commit86b151cdc26e1566efef728aac4ebb2aabce776a (patch)
treecddf785c30aaa09d058e8944cea2581743b189dd /sci-misc
parenta4f9ab81d6cbfc3ff649dd3577e3efa700b47387 (diff)
gentoo auto-resync : 06:10:2022 - 07:21:10
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/Manifest.gzbin2916 -> 2915 bytes
-rw-r--r--sci-misc/fitscut/Manifest3
-rw-r--r--sci-misc/fitscut/files/fitscut-1.4.4-clang16.patch7
-rw-r--r--sci-misc/fitscut/fitscut-1.4.4-r1.ebuild (renamed from sci-misc/fitscut/fitscut-1.4.4.ebuild)30
4 files changed, 26 insertions, 14 deletions
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 9b5720e166dc..b0cc92d64a50 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
Binary files differ
diff --git a/sci-misc/fitscut/Manifest b/sci-misc/fitscut/Manifest
index 60cbd4d17289..33aa573dc581 100644
--- a/sci-misc/fitscut/Manifest
+++ b/sci-misc/fitscut/Manifest
@@ -1,4 +1,5 @@
+AUX fitscut-1.4.4-clang16.patch 148 BLAKE2B 4e77fbcb9be4e3910fe7404f514f451e780ca58c74141caa8791185fc330a9a587d8c8c9b5e0e39c8e8bc172b727ce40c55a6e516f24fed6fe3af2440bbb15a2 SHA512 61014ce54fca8402dbe55d6b9aa4f3125ec2c8132969fa726702b20ca7b9774ed1a21df0b743e3a1229f8dfeac1cfff693dfd9dc791163cf8547deede110c58c
AUX fitscut-1.4.4-fix-asinh.patch 1238 BLAKE2B bd5badf9274a00cc27202f1ec25c3ed7d1a896c904e0ed842b3070b8c261ebb2a50f818b9307949e5d631f75c6147394b7b6ac2ecc4757409ee059a794c4b8b4 SHA512 dc0f72c3177ebccbcfd062bf4e12ef5775e91eb53a3ccdb7ce0aeacec698e469c3593e6d33c7bc27f73b71d588a999ca9c51c0b36dde926f7e7fd8108324afd9
DIST fitscut-1.4.4.tar.gz 163663 BLAKE2B 56218b6d6c4481fda1f2ffba1a4c7f287c424d107133da0e9b087c3685d2b3f69b10e17fc52d2d5f0781cbe7ffcd54178d9e572b4ae368efd634b78338b12816 SHA512 1d80671efeebfb07e7e2714d9cdbdd445a2e7644119d5b82ba4a8f033b36e773d13f87998ece45091f4a127beca374021e8c5afd88f649c9405fb329cd1ee97f
-EBUILD fitscut-1.4.4.ebuild 937 BLAKE2B 52077998c8c7abaaf4ee910e28f0b1bf0c5c9eb0e11ca3d5fc46a54865042554c099ef5124fe3de3b2bfd34df32dcaac941bf16ae872f9a5277629b77f13d176 SHA512 c369f1baff8c6378a1357f7f66a9ff6e25fd090657b7f31acf53ae08a263af129d9c71365ef716e9b244d6be7a87f8f1d1d606f01ec38dc553fdeb21efe5fde2
+EBUILD fitscut-1.4.4-r1.ebuild 896 BLAKE2B 33ac53995054b73f40f4bf1bcc4491709ed2d8d7a4fef35c4012913557a375bfd9a607ed71583817f7769b1b2c5993c3f0374c8517139d414017c006f8f77064 SHA512 c5782d352494ab88a52737f5b14391725d8b8758f696e5953a8b3391ce00f5bee2d3c51ea91ff3503296da635130798534e6f05a1a809cb1d87bfd4931bc75fe
MISC metadata.xml 565 BLAKE2B 18cc1bd68f2090c4ef4801e927f7a6611ce2b5e889cfffd749ac983597c861147ee7a6e577643e390ae285deef818a38981840f1caed9d5c3fb1ad45244626bc SHA512 d3b0b632caf1b0c529b25692a6c2e3b358b22d810f447d1ee823efc2161cf604de3ee60db9b21a07cd42c4e0d1d7868d84dea0922d9f52c8916ad575ddc63489
diff --git a/sci-misc/fitscut/files/fitscut-1.4.4-clang16.patch b/sci-misc/fitscut/files/fitscut-1.4.4-clang16.patch
new file mode 100644
index 000000000000..c41014d13f7c
--- /dev/null
+++ b/sci-misc/fitscut/files/fitscut-1.4.4-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/870928
+--- a/colormap.c
++++ b/colormap.c
+@@ -28,2 +28,3 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
diff --git a/sci-misc/fitscut/fitscut-1.4.4.ebuild b/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
index 918c52024dbc..1b88c8f32e5f 100644
--- a/sci-misc/fitscut/fitscut-1.4.4.ebuild
+++ b/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
DESCRIPTION="Extract cutouts from FITS image files"
-HOMEPAGE="http://acs.pha.jhu.edu/general/software/fitscut/"
-SRC_URI="http://acs.pha.jhu.edu/general/software/fitscut/download/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
RDEPEND="
- sci-libs/cfitsio:0=
- sci-astronomy/wcstools:0=
- media-libs/libpng:0=
- virtual/jpeg:0="
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ sci-astronomy/wcstools
+ sci-libs/cfitsio:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}-fix-asinh.patch" )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-asinh.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
src_prepare() {
default
+
# gentoo wcs is called wcstools to avoid conflict with wcslib
sed -e 's/libwcs/wcs/g' \
-i wcs*.c fitscut.c || die
+
# cfitsio/fitsio.h might conflict with host on prefix
sed -e 's/LIB(wcs,/LIB(wcstools,/' \
-e 's/-lwcs/-lwcstools/' \
-e '/cfitsio\/fitsio.h/d' \
- configure.in > configure.ac || die
- rm configure.in
+ -i configure.in || die
+
eautoreconf
}