gentoo auto-resync : 11:03:2025 - 01:49:36HEADmaster

4 files changed, 110 insertions, 0 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 56f8ca64c943..f795d6f6e20e 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/montage/Manifest b/sci-astronomy/montage/Manifest
index 654a694c8670..fff9e17f1474 100644
--- a/sci-astronomy/montage/Manifest
+++ b/sci-astronomy/montage/Manifest
@@ -1,6 +1,8 @@
 AUX montage-4.1-fix_format_errors.patch 705 BLAKE2B 8eed539374451d5124adb3d32ca9a68d1ce0d12f25719e9f2997d4495c01dc41248cab6ad6eaed9a910407033174fd89a1f88f02edcc905b1bb0b3145605493e SHA512 16019fcc1c5e352296c2835052ca9f2c6e755a15eb435b74da6d01b1c70bf514f87d5af4c1c85ba0e8b0c28f7fdeca70e8c9f80862cafbfd68ab5bd527708f16
 AUX montage-4.1-initdistdata.patch 619 BLAKE2B 62093c780263c8b70f2df0de459c8a6b420d187ea9921b4ffc84435fbffb4f6de100a926ce56a5f2cf7897e2a6c9f93ef9bbffb2b5f6bfcaffcf317d6bf0d2da SHA512 6b4b195f804fb16dd3acdfb53288800ac07af9b05749ad8e8305fe415488e921a65ffb6ce19632da420dea6235eb3ed28826a437a8b7ad22869065a916422ea5
+AUX montage-5.0-c23.patch 907 BLAKE2B c2d35544255580783d6106018b1d1d88f34f93aa6fb49b137924616799a5ac934152abd7d7d5e45d46150a4c52afe344cc34072115f621e6802869ad43ebabae SHA512 7813a84e8d6da50b34c7b814abd0fd156c789736c6cc8d39b06c417684db049fb719b6be480d8cf5b2b2b8dc6ad94bc7e89bd90b5018b807a5dd3cf5103e3bc8
 AUX montage-5.0-fix_freetype_incude.patch 1164 BLAKE2B 94d791eb684d9a6a725a90b9361f1ef29d6654c59bfe4b0620a1af4412a49ade15fae9f6e0ff5b63134574e73a7ff75190f40df4bc3883cfc6e9c286e9d63573 SHA512 1ca955f06765fc90164190a090ec177a06c9cb359fe93b43b8553af06b8eb4a06c8d2685d76fbee0fc70dad525a184b9a4dfde8acef4f4d9703610fb69b73ad5
 DIST Montage_v5.0.tar.gz 14663443 BLAKE2B b7dea04a0b9650b3e32bc425891c1221d60123c29663013b4af860efc238dee7552a2b55514ad7eda3be659873e3f14d2039b2e6eea20f565d64c7b8bd055069 SHA512 1396c7f846db4844d2e861622d152f2115ad4c684da02bb14116dfe3d01b559feaf29572663d0dfd234aa50843afaca3bb072d9127fbb2b539a14327c48499ae
+EBUILD montage-5.0-r1.ebuild 1799 BLAKE2B 49943069dc0d22bc2ed8761eae3c5786a32767efc35a663d12c54898424d89c52b53db933a73d95b938e2d09f9d6f99ee220a04641220c136a6296161a1ab046 SHA512 4468b80a9cffd4d3cd193d149081a0c07ece3d5d88c281a5e2190a09cb1d0ecae3d16470b0fa1128b9b452843e689c81affd7da5c15d10a6b1521d8d00743698
 EBUILD montage-5.0.ebuild 1651 BLAKE2B 2199e85858ecc798b6664d620f4685703a7c973ebf33cf4bb39f37abfd921cf18dbde1fb78812301215c152e5e8b56948e1e90901281881d9c88e4f121133e37 SHA512 0d15f64a7c075082bb098a69453cbbaf61d81c914388931e4352155eac871f76c36a3abd2c29be8f0afc58ef22ba64047f3045402cf10b2c7772dc0418d5c13a
 MISC metadata.xml 1032 BLAKE2B 998c8753167679cd4446dc223990e6c6b5af858a6561d912656da9aa1026b6f3ac407d1e86d43b7fda36cdaa5eff0d0b381dae6f99512ab8f1660a6ba54b83ca SHA512 ce0b489ca4f62e1e30ec6e39a53dbf11fe0bca57e3169d33a734c6cc8a48ba721d9693adde15a2ac88228be2eb341a7328e12062fee98f76f99887de1f0b0191
diff --git a/sci-astronomy/montage/files/montage-5.0-c23.patch b/sci-astronomy/montage/files/montage-5.0-c23.patch
new file mode 100644
index 000000000000..02798a47ebf3
--- /dev/null
+++ b/sci-astronomy/montage/files/montage-5.0-c23.patch
@@ -0,0 +1,34 @@
+Add missing library header, remove unused function
+https://bugs.gentoo.org/920316
+https://bugs.gentoo.org/741080
+--- a/grid/Pegasus/mPresentation.c	2025-03-02 22:04:54.247085465 +0400
++++ b/grid/Pegasus/mPresentation.c	2025-03-02 22:06:57.356329407 +0400
+@@ -14,6 +14,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <strings.h>
++#include <string.h>
+ 
+ #define MAXLEN 20000
+ 
+--- a/lib/src/two_plane_v1.1/initdistdata.c	2025-03-02 22:04:54.227996254 +0400
++++ b/lib/src/two_plane_v1.1/initdistdata.c	2025-03-02 22:06:11.307762628 +0400
+@@ -26,18 +26,6 @@
+   return 0;
+ }
+ 
+-void closefitsfile()
+-{ 
+-  int I_fits_return_status=0;
+-  fits_close_file(ffp_FITS_In, &I_fits_return_status); 
+-  if (I_fits_return_status != 0)
+-  {
+-     fprintf(stderr, "Error closing file\n");
+-     return -1;
+-  }
+-  return 0;
+-}
+-
+ int initdata_byheader(char *fitsheader, DistCoeff *coeff) 
+ {
+   int i, j, m=0, n=0;
diff --git a/sci-astronomy/montage/montage-5.0-r1.ebuild b/sci-astronomy/montage/montage-5.0-r1.ebuild
new file mode 100644
index 000000000000..c149a7e32ae7
--- /dev/null
+++ b/sci-astronomy/montage/montage-5.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MYPN=Montage
+DESCRIPTION="Toolkit for assembling FITS images into mosaics"
+HOMEPAGE="http://montage.ipac.caltech.edu/"
+SRC_URI="http://montage.ipac.caltech.edu/download/${MYPN}_v${PV}.tar.gz"
+S="${WORKDIR}/${MYPN}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc mpi"
+
+RDEPEND="
+	media-libs/freetype:2=
+	media-libs/libjpeg-turbo:0=
+	sci-astronomy/wcstools:0=
+	sci-libs/cfitsio:0=
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-fix_format_errors.patch
+	"${FILESDIR}"/${PN}-4.1-initdistdata.patch
+	"${FILESDIR}"/${PN}-5.0-fix_freetype_incude.patch
+	"${FILESDIR}"/${PN}-5.0-c23.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e '/cfitsio/d' \
+		-e '/wcssubs/d' \
+		-e '/jpeg/d' \
+		-e '/freetype/d' \
+		-i lib/src/Makefile || die
+
+	tc-export CC AR
+
+	# bug #708396
+	append-cflags -fcommon -std=gnu17
+
+	find . -name Makefile\* | xargs sed -i \
+		-e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \
+		-e "/^CFLAGS.*=/s:-g:${CFLAGS} $($(tc-getPKG_CONFIG) --cflags wcstools):g" \
+		-e "s:-I../../lib/freetype/include :$($(tc-getPKG_CONFIG) --cflags freetype2):g" \
+		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:g' \
+		-e "s:-lwcs:$($(tc-getPKG_CONFIG) --libs wcstools):g" \
+		-e "s:-lcfitsio:$($(tc-getPKG_CONFIG) --libs cfitsio):g" \
+		-e 's:-lnsl::g' \
+		-e "s:ar q:$(tc-getAR) q:g"  || die
+
+	if use mpi; then
+		sed -e 's:# MPICC:MPICC:' \
+			-e 's:# BINS:BINS:' \
+			-i Montage/Makefile.* || die
+	fi
+
+	# Handwritten makefile. No parallel build support
+	# bug #888553 #942753
+	MAKEOPTS=-j1
+}
+
+src_install() {
+	dobin bin/*
+	dodoc README* ChangeHistory
+	use doc && dodoc -r man/*
+}