gentoo resync : 11.05.2021

7 files changed, 53 insertions, 25 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 3eca6f612b31..3b10f030dcf2 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stiff/Manifest b/sci-astronomy/stiff/Manifest
index 4fa664e2fba3..5dcb6629bf75 100644
--- a/sci-astronomy/stiff/Manifest
+++ b/sci-astronomy/stiff/Manifest
@@ -1,3 +1,4 @@
+AUX stiff-2.4.0-autotools.patch 154 BLAKE2B 9eeccdea7de24883a90a564474c9bb981d9788fcacfdc94aa85fe705b46b37bf1916001605fc823e238c5936379dd6c2d04ae82da595295aa21719432be5e951 SHA512 63e790c8f1b1193cef94312b122cb28aa9552da95919adad180cf7e95ba7fe98560a5e91b9798e73453152ae008548ed3eab9f15cca1d4cef3b1536bb6cc4ea7
 DIST stiff-2.4.0.tar.gz 1074161 BLAKE2B 50a865985184b1b5cbd78024ed3ee72fa6d19431dbe99336d1ad671eaf076a5aa94471a11d447e3981881c789c00167b89c3fa92262f48f03f8a4251fa8cce3f SHA512 c8a293a2d1771b21d8af1194f9a2f582eca1a363964e76b78319c9cc2407332ef5e31dc74c0d10b9d5c7b6ae18ebd35ee59c53ad31c5f3966fabcd03948cadf6
-EBUILD stiff-2.4.0.ebuild 865 BLAKE2B a4627caf440e512b1e455b66e1697b8a39f55d0aba9add1b13e34bc47934c688ea71fe9a5d59598182f2aecbcf871c6336d501898663f54ccd104a15add8b900 SHA512 784820696e586935fd74270b8d7b77ae5f8a6aa708fce9d1cfc6ea675a754380d8cfdde266925daab1ce6f830f1bb25aae8d45f2cdde30000fc3df0ea10c621c
+EBUILD stiff-2.4.0.ebuild 833 BLAKE2B 49891582f644022308d34ebe5ef4805c6dde2fa75930ffdfee096d29bb9519326ca167c7bebc8cb8289286fc041cf2b411ab8e5967d278d2c8fdde94ea7eb693 SHA512 affd2e66eb74082767d94745386edf1025a67f30e96e2b852ed8f3f2118b5d0c4ab93a4afad9c1d8e453a53fadf740e9902cf011512011eae0b14aca7eee4c3f
 MISC metadata.xml 465 BLAKE2B 09afaab47c9bffec55573bbbeecadce07f4e25f0e7010c261815479670e2484731420d9a6e6bce4463a4dc4e2ec73b1d36439b974537ce1aa75053b83638a0dd SHA512 651824579acd42807a5033d63b3803af2fa0d97f7742df3bf44d657bced9eeab5e89dcff1182cd3257c9815a1b44167df5326977f52b21a25b6e8cd6e1c4eafc
diff --git a/sci-astronomy/stiff/files/stiff-2.4.0-autotools.patch b/sci-astronomy/stiff/files/stiff-2.4.0-autotools.patch
new file mode 100644
index 000000000000..0a3bb4de9ee6
--- /dev/null
+++ b/sci-astronomy/stiff/files/stiff-2.4.0-autotools.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,7 @@
+ fi
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB(m, sin)
diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
index 85bdc78a39f9..02e91240249e 100644
--- a/sci-astronomy/stiff/stiff-2.4.0.ebuild
+++ b/sci-astronomy/stiff/stiff-2.4.0.ebuild
@@ -3,20 +3,15 @@
 
 EAPI=7
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-else
-	inherit flag-o-matic
-	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
+inherit autotools flag-o-matic
 
 DESCRIPTION="Converts astronomical FITS images to the TIFF format"
 HOMEPAGE="http://www.astronomatic.net/software/stiff"
+SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads"
 
 RDEPEND="
@@ -25,16 +20,21 @@ RDEPEND="
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	# https://bugs.gentoo.org/725272
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
 src_prepare() {
 	default
-
-	# bug #708382
-	append-cflags -fcommon
+	eautoreconf
 }
 
 src_configure() {
-	CONFIG_SHELL="${EPREFIX}/bin/bash" ECONF_SOURCE="${S}" econf \
-		$(use_enable threads)
+	# https://bugs.gentoo.org/708382
+	append-cflags -fcommon
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf $(use_enable threads)
 }
 
 src_install() {
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
 }