[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/

[Christoph Junghans]

commit:     fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Feb  7 10:45:00 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Feb  7 10:46:35 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe3895ee

sci-libs/cgnstools: Move to EAPI=5

---
 sci-libs/cgnstools/ChangeLog                 |  6 +++++-
 sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild | 17 ++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sci-libs/cgnstools/ChangeLog b/sci-libs/cgnstools/ChangeLog
index bf02371..5c85164 100644
--- a/sci-libs/cgnstools/ChangeLog
+++ b/sci-libs/cgnstools/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/cgnstools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Feb 2015; Marius Brehler <mar...@linux.sungazer.de>
+  cgnstools-2.5.4-r1.ebuild:
+  Move to EAPI=5
+
   19 May 2010; Oliver Borm (boroli) <oli.b...@web.de>
   cgnstools-2.5.4-r1.ebuild, +files/cgnstools-2.5.4_gcc4.4.patch:
   Fixed gcc-4.4 compile problems

diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild 
b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
index 21c70a5..d47de5c 100644
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
+++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils multilib versionator
 
@@ -41,24 +41,19 @@ src_configure() {
        if use tcl ; then
                TCLVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))"
                myconf="${myconf} $(use_with tcl tcl 
/usr/$(get_libdir)/tcl${TCLVER})"
-               sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in
+               sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in 
|| die
        fi
 
        if use tk ; then
                # no, there's no tkversion, and type -P wish requires running X
                TKVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))"
                myconf="${myconf} $(use_with tk tk 
/usr/$(get_libdir)/tk${TKVER})"
-               sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in
+               sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in || 
die
        fi
 
        econf \
                $(use_with X x) \
-               ${myconf} \
-               || die "econf failed"
+               ${myconf}
 
-       sed -i -e "s|${D}||" cgconfig
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
+       sed -i -e "s|${D}||" cgconfig || die
 }