[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/montage/

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/montage/

[Sam James]

commit:     e8c2408f77fc7284593b0260a62b8998438afb51
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 04:20:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 04:20:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c2408f

sci-astronomy/montage: fix gcc 10 (-fno-common) build

Closes: https://bugs.gentoo.org/708396
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-astronomy/montage/montage-5.0.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/sci-astronomy/montage/montage-5.0.ebuild b/sci-astronomy/montage/montage-5.0.ebuild
index d426c00c3c1..850a2ff98dc 100644
--- a/sci-astronomy/montage/montage-5.0.ebuild
+++ b/sci-astronomy/montage/montage-5.0.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+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"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-
 IUSE="doc mpi"
 
 RDEPEND="
@@ -31,10 +30,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-fix_freetype_incude.patch
 )
 
-S="${WORKDIR}/${MYPN}"
-
 src_prepare() {
 	default
+
 	sed -e '/cfitsio/d' \
 		-e '/wcssubs/d' \
 		-e '/jpeg/d' \
@@ -43,6 +41,9 @@ src_prepare() {
 
 	tc-export CC AR
 
+	# bug #708396
+	append-cflags -fcommon
+
 	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" \

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/montage/

[Sebastien Fabbro]

commit:     0de9f1327427e331d186ea3ff835d97191efd3de
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 21:37:24 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 21:37:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de9f132

sci-astronomy/montage: fix sed issue when mpi flag is set (bug #586412)

Package-Manager: portage-2.3.0

 sci-astronomy/montage/montage-4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/montage/montage-4.1.ebuild b/sci-astronomy/montage/montage-4.1.ebuild
index 37e1207..a887d9e 100644
--- a/sci-astronomy/montage/montage-4.1.ebuild
+++ b/sci-astronomy/montage/montage-4.1.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
 	if use mpi; then
 		sed -e 's:# MPICC:MPICC:' \
 			-e 's:# BINS:BINS:' \
-			-i Montage/Makefile || die
+			-i Montage/Makefile.* || die
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/montage/

[Sebastien Fabbro]

commit:     0766ccc20ca20bd6e356f11714de683182b21a07
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 15:51:03 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 15:51:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0766ccc2

sci-astronomy/montage: workaround trailing spaces for some pkgconfig

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=585466

Package-Manager: portage-2.3.0_rc1

 sci-astronomy/montage/montage-4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/montage/montage-4.1.ebuild b/sci-astronomy/montage/montage-4.1.ebuild
index db6c721..37e1207 100644
--- a/sci-astronomy/montage/montage-4.1.ebuild
+++ b/sci-astronomy/montage/montage-4.1.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 	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:-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" \