gentoo resync : 09.07.2022

3 files changed, 90 insertions, 1 deletions

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 287cde1dcbff..c420b9c3d10e 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -10,5 +10,6 @@ DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c
 DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
 EBUILD cfitsio-3.490.ebuild 1718 BLAKE2B 6b89bbad5bc1876148a9360d47931bc3a03a3475a7860a01c1a6ea8ecd87d117c8f10eeff492664c2c284877b7d613aec1e926b472840dd8023b15bd9b0bc17f SHA512 a046886cb8c0e6ede4581128323f1959d24c27713e45f3443a4bfda7fed80f4917f17071a06acf34c891abe07d089ea24f4774f5cb1448da348c823ade163a31
 EBUILD cfitsio-4.0.0.ebuild 1677 BLAKE2B 63c18cc01c1c2037406c01e81d288a56537be3f39b72804306385005d664ac8077ef2db5225b7d585c84351ba6b7995dcbbc6da9dd4a90944acc25635dd56636 SHA512 3137d219a4c46b29f5930a965c10129b125af7887fcf1aed6e9f97e2b5903ef54b32a7984d034e4e98a4c44ab48cc7300c8508d3d0501f9df6575aaf9b10b8f0
-EBUILD cfitsio-4.1.0.ebuild 1807 BLAKE2B 492b65b81b8a2ceb64eb89531b044c8cb5e53c05d58b9d0380101a402789772e97577d7dd39dc3993b5514787ff0eb3b99c0866c71c503eedfc4ca2f0fe2f8ef SHA512 c772fdcb8c8b7c16f07cafe63db94ef7a32b4774d4002b2d43722ed7c3d3cba155e7b50df7c0f029cbf178eab0f61e73444e4d130fc5a204a8d9ba3c80aa307a
+EBUILD cfitsio-4.1.0-r1.ebuild 1899 BLAKE2B 2b650aeca35f4c0422c582d761774fa786e5a2615588196d8345f982dd860ab9b7ded096382e7a17064cba0961657cd0f829c3d98261047208963b84c7734156 SHA512 8f9cabd2a9a0099607c5c759c1a2be608168671ef878031a258edfc26b290d936b5a1ba6d9d35507fbb9fbb2de6b9a122b8c1f268841ae33429a9dc74e3ef5d2
+EBUILD cfitsio-4.1.0.ebuild 1834 BLAKE2B 44e3449fb0f3b5548402b87c06dc657923db89f9548714ba0495b7f781e9efeed493cce75fce513f1fd6417d30845d00ea70b0f0b43e807648b0aeccda131da6 SHA512 2d63153560fc18da4558c629d3ca5904ad381d90fae2c3c799dc2d7f619d9300506f1b37a9f7322c9c8225c01f15502e03100edc7c329bca1878e27b84787391
 MISC metadata.xml 881 BLAKE2B 2f978abf534047204754f13ca59b712e42fe1e9db77335f132cd323d9ea95bef5aa287ce154f77776617aebd56d52abc8d812fc06b5fa604173de669ce225c8f SHA512 54dc397e396a370b7660240dd0e04bfcc0ff249bdaf82046f89c94fffff552391e219a6314224227858d3343aea54bcb2b56d4cd3e1ae069bee749d5025717d4
diff --git a/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..e3858e96e7cc
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.1.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 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 ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl threads tools 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}] )
+"
+# 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
index 4a55f5bf63bc..fa8f7ebd1513 100644
--- a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
@@ -22,6 +22,7 @@ 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}