[gentoo-commits] proj/sci:master commit in: sci-mathematics/giac/

[Justin Lecher]

commit:     0ad0380dbf0cb537b121adbe6e6fcf8ba0a2e080
Author:     Dominik Schmidt <das1993 <AT> hotmail <DOT> com>
AuthorDate: Sat Aug  9 07:36:33 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Aug  9 16:28:08 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0ad0380d

sci-mathematics/giac: Ebuild fix

FLTK paths added to CPPFLAGS and LDFLAGS.
The code invokes fltk-config, which breaks crosscompileability.

---
 sci-mathematics/giac/ChangeLog         |  3 +++
 sci-mathematics/giac/giac-1.1.0.ebuild | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/sci-mathematics/giac/ChangeLog b/sci-mathematics/giac/ChangeLog
index 5635167..40d2c71 100644
--- a/sci-mathematics/giac/ChangeLog
+++ b/sci-mathematics/giac/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2014; Dominik Schmidt <das1...@hotmail.com>
+  Fixed fltk handling
+
   21 Jun 2014; Jonathan-Christofer Demay <jcde...@gmail.com>
   -giac-1.0.0.ebuild, +giac-1.1.0.ebuild:
   version bump

diff --git a/sci-mathematics/giac/giac-1.1.0.ebuild 
b/sci-mathematics/giac/giac-1.1.0.ebuild
index 4b2232c..4993db4 100644
--- a/sci-mathematics/giac/giac-1.1.0.ebuild
+++ b/sci-mathematics/giac/giac-1.1.0.ebuild
@@ -13,6 +13,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc examples fltk"
 
+AUTOTOOLS_IN_SOURCE_BUILD=true
+inherit autotools-utils flag-o-matic
+
 RDEPEND=">=dev-libs/gmp-3
                >=sys-libs/readline-4.2
                fltk? ( >=x11-libs/fltk-1.1.9 )
@@ -32,6 +35,19 @@ src_prepare(){
        fi
 }
 
+src_configure(){
+       if use fltk
+       then
+               append-cppflags -I$(fltk-config --includedir)
+               append-lfs-flags
+               append-libs $(fltk-config --ldflags | sed -e 
's/\(-L\S*\)\s.*/\1/')
+       fi
+       local myeconfargs=(
+               user_enable fltk gui
+       )
+        autotools-utils_src_configure || die "configuring failed"
+}
+
 src_install() {
        emake install DESTDIR="${D}" || die "emake install failed"
        mv ${D}/usr/bin/{aide,giac-help}