| 1 |
jlec 13/03/01 12:18:24 |
| 2 |
|
| 3 |
Modified: ChangeLog gsl-shell-2.2.0.ebuild |
| 4 |
Log: |
| 5 |
sci-mathematics/gsl-shell: Use pkg-config to detect gsl, libagg, freetype (#459474) and fox |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 sci-mathematics/gsl-shell/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- ChangeLog 27 Feb 2013 15:07:24 -0000 1.9 |
| 23 |
+++ ChangeLog 1 Mar 2013 12:18:24 -0000 1.10 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-mathematics/gsl-shell |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.9 2013/02/27 15:07:24 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.10 2013/03/01 12:18:24 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 01 Mar 2013; Justin Lecher <jlec@g.o> gsl-shell-2.2.0.ebuild, |
| 31 |
+ +files/gsl-shell-2.2.0-pkg-config.patch: |
| 32 |
+ Use pkg-config to detect gsl, libagg, freetype (#459474) and fox |
| 33 |
|
| 34 |
27 Feb 2013; Justin Lecher <jlec@g.o> gsl-shell-2.2.0.ebuild: |
| 35 |
Add missing dep on virtual/pkgconfig |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: gsl-shell-2.2.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- gsl-shell-2.2.0.ebuild 27 Feb 2013 15:07:24 -0000 1.4 |
| 52 |
+++ gsl-shell-2.2.0.ebuild 1 Mar 2013 12:18:24 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.4 2013/02/27 15:07:24 jlec Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.5 2013/03/01 12:18:24 jlec Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -30,7 +30,12 @@ |
| 62 |
S="${WORKDIR}"/${PN} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- epatch "${FILESDIR}"/${PN}-font.patch "${FILESDIR}"/${PN}-strip.patch "${FILESDIR}"/${PN}-usr.patch |
| 66 |
+ tc-export PKG_CONFIG |
| 67 |
+ epatch \ |
| 68 |
+ "${FILESDIR}"/${PN}-font.patch \ |
| 69 |
+ "${FILESDIR}"/${PN}-strip.patch \ |
| 70 |
+ "${FILESDIR}"/${PN}-usr.patch \ |
| 71 |
+ "${FILESDIR}"/${P}-pkg-config.patch |
| 72 |
use fox || epatch "${FILESDIR}"/${PN}-nogui.patch |
| 73 |
} |
| 74 |
|
| 75 |
@@ -40,10 +45,10 @@ |
| 76 |
if use fox; then |
| 77 |
local FOX_INCLUDES=`WANT_FOX=1.6 fox-config --cflags` |
| 78 |
local FOX_LIBS=`WANT_FOX=1.6 fox-config --libs` |
| 79 |
- emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" \ |
| 80 |
+ emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" \ |
| 81 |
FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}" |
| 82 |
else |
| 83 |
- emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" |
| 84 |
+ emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" |
| 85 |
fi |
| 86 |
|
| 87 |
if use doc; then |
Archives