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

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

[Sam James]

commit:     56ab65de7dfe1d8de3aa2e932426386fe9f3e947
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 04:52:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 04:52:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ab65de

sci-astronomy/stiff: fix gcc 10 build

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

 sci-astronomy/stiff/stiff-2.4.0.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
index 5d5e1701b58..85bdc78a39f 100644
--- a/sci-astronomy/stiff/stiff-2.4.0.ebuild
+++ b/sci-astronomy/stiff/stiff-2.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-	SRC_URI=""
 else
+	inherit flag-o-matic
 	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -25,8 +25,16 @@ RDEPEND="
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	# bug #708382
+	append-cflags -fcommon
+}
+
 src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable threads)
+	CONFIG_SHELL="${EPREFIX}/bin/bash" ECONF_SOURCE="${S}" econf \
+		$(use_enable threads)
 }
 
 src_install() {

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

[Sam James]

commit:     b849a927af0b03ee4a4391558a07633c50147aff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:31:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 01:38:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b849a927

sci-astronomy/stiff: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-astronomy/stiff/{stiff-2.4.0.ebuild => stiff-2.4.0-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
similarity index 90%
rename from sci-astronomy/stiff/stiff-2.4.0.ebuild
rename to sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
index 02e91240249e..fe8f85b3322f 100644
--- a/sci-astronomy/stiff/stiff-2.4.0.ebuild
+++ b/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc threads"
 
 RDEPEND="
-	media-libs/tiff:0=
-	virtual/jpeg:0
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"