From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 11 May 2021 19:55:43 +0100
Subject: gentoo resync : 11.05.2021

---
 sci-astronomy/xfitsview/Manifest                     |  4 ++--
 .../xfitsview/files/xfitsview-2.2-build_system.patch | 15 ++++++++++++++-
 sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild      | 20 ++++++++++++--------
 3 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'sci-astronomy/xfitsview')

diff --git a/sci-astronomy/xfitsview/Manifest b/sci-astronomy/xfitsview/Manifest
index d08f30fd1aa1..7a14fea9c7cf 100644
--- a/sci-astronomy/xfitsview/Manifest
+++ b/sci-astronomy/xfitsview/Manifest
@@ -1,4 +1,4 @@
-AUX xfitsview-2.2-build_system.patch 1316 BLAKE2B 150e60e642fec7cd20688aa70696c48eb69e63ec4caf197d988c6063160e05d7c057e43bdf3abc10916ae111d699ad6789a66e9b6ddf21fca547df79846e93d8 SHA512 a8d40252424f7c49fbe7fd3b6d2d6f5fbbdb0b09c01d1aff0854cf55576106dfba29ec63557ac7e3b06971a502413e901e3ccc7bc8443d36937b17495e87cdaf
+AUX xfitsview-2.2-build_system.patch 1589 BLAKE2B 63e0f2a27ad6e90103f7dfab3b2bbc1b7df9ddadb95c6afdc6573bb2ebc22b580cca37073a5631d9d91cc3aec26f87a0c951132cf7bef32608817d2bf612e19f SHA512 9cba766923ba88f8a0bec49bbea9b05b371d4b436ad5cbe2089e31cad99c0d58fccf404b21ff4b6aea6f97c80e6e6384d4b9843d2ee71807e201fc80c13fe39a
 DIST xfitsview2.2.tgz 290959 BLAKE2B 5825d078319ea17d6202dc1cf3a49b7bef4cb6ff9d0e5621bc33b27fbcb4d1f8753cfa191eacf3b89b29fc1401269282c4798ad9d49f0a47916f7bc3a1b24e55 SHA512 01e57f0dd9c7320b86683a2235e7a779828f19c34b9380d5127bad85941e8861fd86f17a276f7ec60038d9e3bc4c8df54cc6291b70f8c7ecce4ef17cfb92b1b9
-EBUILD xfitsview-2.2-r2.ebuild 704 BLAKE2B 30850abc4635e6df502aa8aaec89d6f2b6f3ef67f8ef52d0a36f91af9195da1bc76d05c3b7d25b1c04f4f1256b440b7abac04e605063ef50f4cfd0367a4fea40 SHA512 b82c13d884fff8ae6b84901075b4de982145d288deec1b95c1e83e62e111d0ef99d435ab8917d8acd653de9dfd40e71d9c3dee2c3a187fd009a6177838aea16e
+EBUILD xfitsview-2.2-r2.ebuild 740 BLAKE2B bde1b58d91707ca36e7cb79f5a158558c27ba62182cf26b4570d58a4f83b9c60348e9759456ca3f5f474c3dec6d7511a14be3cd9de55b602eb936d9d9d770691 SHA512 d0abbb8f8da869f1c012f51a9ee5c45c375cac960f308c11a7abdd27b070b3737f3c282d466a778578eff39eb55c1db7c2ad66ec6a8b8a83d3f90bbec9b529ec
 MISC metadata.xml 505 BLAKE2B 6aa9e24da6377207c4379bf89c6f0f6bd7d81502e575cb23b8a652641e4f81100fdd6de1b74ec1a0614f8dd0203d1b01a3cedbf81e51f9b61dc9eb1cdc0d87c7 SHA512 16fff0caa6caf6a2df55d21b5bc20e8da05c3bd1cf716340a521f0e4ceaecb24fa61e5888640fa507931094fc16357c95dc6e7b346033865c0eef65060b37a20
diff --git a/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
index 12eaacf4e244..ca45aa7ba39a 100644
--- a/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
+++ b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
@@ -1,9 +1,22 @@
 * Fix parallel build
 * Respect LDFLAGS
 * Fix build with gmake 3.82
+* Respect AR
 
-http://bugs.gentoo.org/show_bug.cgi?id=337479
+https://bugs.gentoo.org/337479
+https://bugs.gentoo.org/725292
 
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -44,7 +44,7 @@
+ 
+ #  build fitssub library
+ $(ARCH)/libfitsLib.a: ${OBJECTS}
+-	ar rv $(ARCH)/libfitsLib.a ${OBJECTS}
++	${AR} rv $(ARCH)/libfitsLib.a ${OBJECTS}
+ 	${RANLIB} $(ARCH)/libfitsLib.a
+ 
+ clean:
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -61,26 +61,26 @@
diff --git a/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild b/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
index ff1ebd1455cc..32762bcf8728 100644
--- a/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
+++ b/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PN=XFITSview
 MY_P=${MY_PN}${PV}
@@ -9,26 +11,28 @@ MY_P=${MY_PN}${PV}
 DESCRIPTION="Viewer for astronomical images in FITS format"
 HOMEPAGE="http://www.nrao.edu/software/fitsview/"
 SRC_URI="ftp://ftp.cv.nrao.edu/fits/os-support/unix/xfitsview/${PN}${PV}.tgz"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND=">=x11-libs/motif-2.3:0"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( README changes notes.text )
 PATCHES=( "${FILESDIR}"/${P}-build_system.patch )
 
 src_prepare() {
 	default
-	find "${S}" -name '*old.c' -delete || die
+	find -name '*old.c' -delete || die
+}
+
+src_configure() {
+	tc-export AR
+	default
 }
 
 src_install() {
 	dobin XFITSview
-	einstalldocs
+	dodoc README changes notes.text
 }
-- 
cgit v1.2.3