| 1 |
commit: 3281e8ef05713154e59c8c84c5f73ad5eb00e080 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 06:14:45 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 06:19:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3281e8ef |
| 7 |
|
| 8 |
sci-mathematics/dataplot: fix build with gcc 10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707176 |
| 11 |
Closes: https://bugs.gentoo.org/722208 |
| 12 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-mathematics/dataplot/dataplot-20131220.ebuild | 25 +++++++++++++++++------ |
| 16 |
1 file changed, 19 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-mathematics/dataplot/dataplot-20131220.ebuild b/sci-mathematics/dataplot/dataplot-20131220.ebuild |
| 19 |
index 11d223e7d7f..ea559f7ade9 100644 |
| 20 |
--- a/sci-mathematics/dataplot/dataplot-20131220.ebuild |
| 21 |
+++ b/sci-mathematics/dataplot/dataplot-20131220.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=6 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit eutils fortran-2 toolchain-funcs autotools |
| 31 |
+inherit autotools fortran-2 flag-o-matic toolchain-funcs |
| 32 |
|
| 33 |
# YEAR MONTH DAY |
| 34 |
MY_PV=${PV:0:4}_${PV:4:2}_${PV:6:2} |
| 35 |
@@ -17,6 +17,7 @@ HOMEPAGE="https://www.itl.nist.gov/div898/software/dataplot/" |
| 36 |
SRC_URI=" |
| 37 |
ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P}.tar.gz |
| 38 |
ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P_AUX}.tar.gz" |
| 39 |
+S="${WORKDIR}/${MY_P}" |
| 40 |
|
| 41 |
SLOT="0" |
| 42 |
LICENSE="public-domain" |
| 43 |
@@ -34,7 +35,6 @@ DEPEND="${COMMON_DEPEND} |
| 44 |
RDEPEND="${COMMON_DEPEND} |
| 45 |
X? ( x11-misc/xdg-utils )" |
| 46 |
|
| 47 |
-S="${WORKDIR}/${MY_P}" |
| 48 |
S_AUX="${WORKDIR}/${MY_P_AUX}" |
| 49 |
|
| 50 |
PATCHES=( "${FILESDIR}"/${PN}-20090821-opengl.patch ) |
| 51 |
@@ -43,9 +43,11 @@ src_unpack() { |
| 52 |
# unpacking and renaming because |
| 53 |
# upstream does not use directories |
| 54 |
mkdir "${S_AUX}" || die |
| 55 |
+ |
| 56 |
pushd "${S_AUX}" > /dev/null || die |
| 57 |
unpack ${MY_P_AUX}.tar.gz |
| 58 |
popd > /dev/null || die |
| 59 |
+ |
| 60 |
mkdir ${MY_P} || die |
| 61 |
cd "${S}" || die |
| 62 |
unpack ${MY_P}.tar.gz |
| 63 |
@@ -53,11 +55,21 @@ src_unpack() { |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
default |
| 67 |
+ |
| 68 |
+ # bug #707176 |
| 69 |
+ append-cflags -fcommon |
| 70 |
+ # bug #722208 |
| 71 |
+ append-fflags $(test-flags-FC -fallow-invalid-boz) |
| 72 |
+ # another Fortran issue |
| 73 |
+ append-fflags $(test-flags-FC -fallow-argument-mismatch) |
| 74 |
+ |
| 75 |
cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die |
| 76 |
cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die |
| 77 |
+ |
| 78 |
sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \ |
| 79 |
-e "s:/usr/local/lib:@datadir@:g" \ |
| 80 |
dp1_linux.f > dp1_linux.f.in || die |
| 81 |
+ |
| 82 |
sed -e "s/(MAXOBV=.*)/(MAXOBV=@MAXOBV@)/" \ |
| 83 |
-e "s:/usr/local/lib:@datadir@:g" \ |
| 84 |
DPCOPA.INC > DPCOPA.INC.in || die |
| 85 |
@@ -76,9 +88,10 @@ src_install() { |
| 86 |
default |
| 87 |
|
| 88 |
if use examples; then |
| 89 |
- insinto /usr/share/doc/${PF}/examples |
| 90 |
- doins -r "${S_AUX}"/data/* |
| 91 |
+ docinto examples |
| 92 |
+ dodoc -r "${S_AUX}"/data/* |
| 93 |
fi |
| 94 |
+ |
| 95 |
insinto /usr/share/dataplot |
| 96 |
doins "${S_AUX}"/dp{mes,sys,log}f.tex |
| 97 |
doenvd "${FILESDIR}"/90${PN} |
Archives