[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stiff/files/, sci-astronomy/stiff/

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stiff/files/, sci-astronomy/stiff/

[David Seifert]

commit:     865415d66249cce12b8fc7b7e9206d28a7c27a74
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May  9 19:18:20 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May  9 19:18:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865415d6

sci-astronomy/stiff: Respect AR

Closes: https://bugs.gentoo.org/725272
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../stiff/files/stiff-2.4.0-autotools.patch        | 10 +++++++++
 sci-astronomy/stiff/stiff-2.4.0.ebuild             | 26 +++++++++++-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

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 00000000000..0a3bb4de9ee
--- /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 85bdc78a39f..02e91240249 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() {