commit:     b234d373f3ba31dc9bcac60b3ab03842b864997d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 15:43:10 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 15:43:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b234d373

sci-chemistry/almost: Bump to EAPI=5

Package-Manager: portage-2.2.14

---
 sci-chemistry/almost/ChangeLog              |  5 +++-
 sci-chemistry/almost/almost-1.0.3-r2.ebuild | 37 ++++++++++-------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/sci-chemistry/almost/ChangeLog b/sci-chemistry/almost/ChangeLog
index b8f81ee..e68b99e 100644
--- a/sci-chemistry/almost/ChangeLog
+++ b/sci-chemistry/almost/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/almost
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Nov 2014; Justin Lecher <[email protected]> almost-1.0.3-r2.ebuild:
+  Bump to EAPI=5
+
 *almost-1.0.3-r1 (11 May 2009)
 
   11 May 2009; Justin Lecher (jlec) <[email protected]>

diff --git a/sci-chemistry/almost/almost-1.0.3-r2.ebuild 
b/sci-chemistry/almost/almost-1.0.3-r2.ebuild
index 314a5d3..47e6815 100644
--- a/sci-chemistry/almost/almost-1.0.3-r2.ebuild
+++ b/sci-chemistry/almost/almost-1.0.3-r2.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
+
 inherit autotools eutils flag-o-matic
 
 DATE="090822"
@@ -28,51 +30,38 @@ DEPEND="${RDEPEND}"
 
 RESTRICT="mirror"
 
-src_unpack(){
-       unpack ${A}
-
-       cd "${S}"
-
-       rm -rf ./include/almost/boost src/lib/iostreams
+src_prepare(){
+       rm -rf ./include/almost/boost src/lib/iostreams || die
 #      rm -rf ./include/almost/boost ./include/almost/boost_1_30 
#src/lib/iostreams
 
        sed -e 's:boost boost_1_30::g' \
-               -i ./include/almost/Makefile.am
+               -i ./include/almost/Makefile.am || die
 
-       epatch "${FILESDIR}"/configure2.patch
-       epatch "${FILESDIR}"/Makefile.patch
+       epatch \
+               "${FILESDIR}"/configure2.patch \
+               "${FILESDIR}"/Makefile.patch
 
        sed \
                -e '/include\/almost\/boost/d' \
                -e '/include\/almost\/tinyxml/d' \
-               -i configure.in
+               -i configure.in || die
 
 #      find include \
 #              -name "*.h" \
 #              -exec sed 's:boost_1_30:boost:g' -i '{}' \;
 
        epatch "${FILESDIR}"/gcc-4.3.patch
-       eautoreconf || die "Reconfiguration failed"
+       eautoreconf
 }
 
 src_compile(){
+       emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" -j1
 
-       econf || die "configure failed"
-
-       emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" 
-j1 || \
-       die "make failed"
-
-}
-
-src_test() {
-       emake check || die "test failed"
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "Install failed"
+       default
 
        insinto /usr/include/${PN}
-       doins {almost,config}.h || die "failed to install missing headers"
-
-       dodoc README NEWS TODO ChangeLog AUTHORS
+       doins {almost,config}.h
 }

Reply via email to