sci-mathematics/dataplot: Drop bashisms from configure.ac, #526888

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 20 insertions, 21 deletions

diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog
index 2b8f7a7e3aa0..588c19620ba8 100644
--- a/sci-mathematics/dataplot/ChangeLog
+++ b/sci-mathematics/dataplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/dataplot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/ChangeLog,v 1.18 2012/10/16 19:13:05 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/ChangeLog,v 1.19 2014/10/26 14:40:18 jlec Exp $
+
+  26 Oct 2014; Justin Lecher <jlec@gentoo.org> dataplot-20090821.ebuild,
+  files/configure.ac.20090821, metadata.xml:
+  Drop bashisms from configure.ac, #526888
 
   16 Oct 2012; Justin Lecher <jlec@gentoo.org> dataplot-20090821.ebuild,
   metadata.xml:
diff --git a/sci-mathematics/dataplot/dataplot-20090821.ebuild b/sci-mathematics/dataplot/dataplot-20090821.ebuild
index 653b48046e19..626821da5313 100644
--- a/sci-mathematics/dataplot/dataplot-20090821.ebuild
+++ b/sci-mathematics/dataplot/dataplot-20090821.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/dataplot-20090821.ebuild,v 1.6 2012/10/16 19:13:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/dataplot-20090821.ebuild,v 1.7 2014/10/26 14:40:18 jlec Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils fortran-2 toolchain-funcs autotools
 
@@ -39,19 +39,19 @@ S_AUX="${WORKDIR}/${MY_P_AUX}"
 src_unpack() {
 	# unpacking and renaming because
 	# upstream does not use directories
-	mkdir "${S_AUX}"
-	pushd "${S_AUX}" > /dev/null
+	mkdir "${S_AUX}" || die
+	pushd "${S_AUX}" > /dev/null || die
 	unpack ${MY_P_AUX}.tar.gz
-	popd > /dev/null
-	mkdir ${MY_P}
-	cd "${S}"
+	popd > /dev/null || die
+	mkdir ${MY_P} || die
+	cd "${S}" || die
 	unpack ${MY_P}.tar.gz
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-opengl.patch
-	cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am
-	cp "${FILESDIR}"/configure.ac.${PV} configure.ac
+	cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die
+	cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die
 	sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \
 		-e "s:/usr/local/lib:@datadir@:g" \
 		dp1_linux.f > dp1_linux.f.in || die
@@ -69,7 +69,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
@@ -79,8 +79,3 @@ src_install() {
 	doins "${S_AUX}"/dp{mes,sys,log}f.tex
 	doenvd "${FILESDIR}"/90${PN}
 }
-
-pkg_postinst() {
-	elog "Before using dataplot, please run (as root):"
-	elog "env-update && source /etc/profile"
-}
diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20090821
index 75ef115e58bc..2343b23823dd 100644
--- a/sci-mathematics/dataplot/files/configure.ac.20090821
+++ b/sci-mathematics/dataplot/files/configure.ac.20090821
@@ -9,7 +9,7 @@ AC_PROG_CC
 AC_PROG_F77
 AC_F77_LIBRARY_LDFLAGS
 case $F77 in
-    *gfortran*) FFLAGS+=" -w -fno-range-check" ;;
+    *gfortran*) FFLAGS="${FFLAGS} -w -fno-range-check" ;;
     *) ;;
 esac
 
diff --git a/sci-mathematics/dataplot/metadata.xml b/sci-mathematics/dataplot/metadata.xml
index 016318076db3..3f98dafdd5f4 100644
--- a/sci-mathematics/dataplot/metadata.xml
+++ b/sci-mathematics/dataplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
-	<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Dataplot is a software system for scientific visualization,
   statistical analysis, and non-linear modeling. The target Dataplot
   user is the researcher and analyst engaged in the characterization,