Fixing blas dependency, restructuring patches

(Portage version: 2.2.0_alpha131/cvs/Linux i686)

6 files changed, 50 insertions, 43 deletions

diff --git a/sci-mathematics/gsl-shell/ChangeLog b/sci-mathematics/gsl-shell/ChangeLog
index aa5514833b6b..a8d3fa4a89cf 100644
--- a/sci-mathematics/gsl-shell/ChangeLog
+++ b/sci-mathematics/gsl-shell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/gsl-shell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.2 2012/09/21 13:26:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.3 2012/09/26 11:15:34 grozin Exp $
+
+  26 Sep 2012; Andrey Grozin <grozin@gentoo.org> gsl-shell-2.2.0_beta1.ebuild,
+  +files/gsl-shell-font.patch, +files/gsl-shell-strip.patch,
+  +files/gsl-shell-usr.patch, -files/gsl-shell.patch:
+  Fixing blas dependency, restructuring patches
 
   21 Sep 2012; Andrey Grozin <grozin@gentoo.org> gsl-shell-2.2.0_beta1.ebuild,
   +files/gsl-shell-nogui.patch:
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
new file mode 100644
index 000000000000..0511b26b8af8
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
@@ -0,0 +1,13 @@
+diff -r -U1 gsl-shell.orig/agg-plot/support_x11.cpp gsl-shell/agg-plot/support_x11.cpp
+--- gsl-shell.orig/agg-plot/support_x11.cpp	2012-09-12 01:13:31.000000000 +0700
++++ gsl-shell/agg-plot/support_x11.cpp	2012-09-26 16:07:10.000000000 +0700
+@@ -4,3 +4,3 @@
+ 
+-const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont/FreeSans.ttf", "ttf-dejavu/DejaVuSans.ttf", 0};
++const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont-ttf/FreeSans.ttf", "dejavu/DejaVuSans.ttf", 0};
+ 
+@@ -8,3 +8,3 @@
+ {
+-    const char* ttf_dir = "/usr/share/fonts/truetype/";
++    const char* ttf_dir = "/usr/share/fonts/";
+     unsigned len = strlen(ttf_dir);
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch b/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch
new file mode 100644
index 000000000000..1d50a7e831af
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch
@@ -0,0 +1,8 @@
+diff -r -U1 gsl-shell.orig/Makefile gsl-shell/Makefile
+--- gsl-shell.orig/Makefile	2012-09-12 01:13:31.000000000 +0700
++++ gsl-shell/Makefile	2012-09-26 16:13:56.000000000 +0700
+@@ -109,4 +109,2 @@
+ 	cp fox-gui/$(GSL_SHELL_GUI) $(INSTALL_BIN_DIR)
+-	strip $(INSTALL_BIN_DIR)/$(GSL_SHELL)
+-	strip $(INSTALL_BIN_DIR)/$(GSL_SHELL_GUI)
+ 	mkdir -p $(INSTALL_LIB_DIR)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch b/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch
new file mode 100644
index 000000000000..20ca6d317c7a
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch
@@ -0,0 +1,8 @@
+diff -r -U1 gsl-shell.orig/makeconfig gsl-shell/makeconfig
+--- gsl-shell.orig/makeconfig	2012-09-12 01:13:31.000000000 +0700
++++ gsl-shell/makeconfig	2012-09-26 16:16:43.000000000 +0700
+@@ -21,3 +21,3 @@
+ 
+-PREFIX= /usr/local
++PREFIX= /usr
+ DESTDIR=
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell.patch b/sci-mathematics/gsl-shell/files/gsl-shell.patch
deleted file mode 100644
index 13d2fa171e39..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -r -U1 gsl-shell.orig/Makefile gsl-shell/Makefile
---- gsl-shell.orig/Makefile	2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/Makefile	2012-09-20 21:53:31.000000000 +0700
-@@ -109,4 +109,2 @@
- 	cp fox-gui/$(GSL_SHELL_GUI) $(INSTALL_BIN_DIR)
--	strip $(INSTALL_BIN_DIR)/$(GSL_SHELL)
--	strip $(INSTALL_BIN_DIR)/$(GSL_SHELL_GUI)
- 	mkdir -p $(INSTALL_LIB_DIR)
-diff -r -U1 gsl-shell.orig/agg-plot/support_x11.cpp gsl-shell/agg-plot/support_x11.cpp
---- gsl-shell.orig/agg-plot/support_x11.cpp	2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/agg-plot/support_x11.cpp	2012-09-20 22:16:30.000000000 +0700
-@@ -4,3 +4,3 @@
- 
--const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont/FreeSans.ttf", "ttf-dejavu/DejaVuSans.ttf", 0};
-+const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont-ttf/FreeSans.ttf", "dejavu/DejaVuSans.ttf", 0};
- 
-@@ -8,3 +8,3 @@
- {
--    const char* ttf_dir = "/usr/share/fonts/truetype/";
-+    const char* ttf_dir = "/usr/share/fonts/";
-     unsigned len = strlen(ttf_dir);
-diff -r -U1 gsl-shell.orig/makeconfig gsl-shell/makeconfig
---- gsl-shell.orig/makeconfig	2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/makeconfig	2012-09-20 19:56:02.000000000 +0700
-@@ -21,3 +21,3 @@
- 
--PREFIX= /usr/local
-+PREFIX= /usr
- DESTDIR=
-diff -r -U1 gsl-shell.orig/makepackages gsl-shell/makepackages
---- gsl-shell.orig/makepackages	2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/makepackages	2012-09-20 21:27:01.000000000 +0700
-@@ -36,4 +36,4 @@
- 
--  FOX_INCLUDES := $(shell pkg-config fox --cflags)
--  FOX_LIBS = $(shell pkg-config fox --libs)
-+  FOX_INCLUDES := -I/usr/include/fox-1.6
-+  FOX_LIBS = -lFOX-1.6 -lX11 -lXext -lfreetype -lXft -lXcursor -lXrender -lXrandr -lXfixes -lXi -lGL -lGLU -ldl -lpthread -lrt -ljpeg -lpng -ltiff -lz -lbz2 -lGLU -lGL
- 
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild
index b51644621cae..8ec9ac55ac23 100644
--- a/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild,v 1.2 2012/09/21 13:26:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild,v 1.3 2012/09/26 11:15:34 grozin Exp $
 
 EAPI=4
 inherit eutils versionator
@@ -15,6 +15,7 @@ KEYWORDS="~x86"
 IUSE="doc fox"
 
 DEPEND=">=sci-libs/gsl-1.14
+	virtual/blas
 	>=x11-libs/agg-2.5
 	>=media-libs/freetype-2.4.10
 	sys-libs/readline
@@ -26,12 +27,23 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}.patch"
-	use fox || epatch "${FILESDIR}/${PN}-nogui.patch"
+	epatch "${FILESDIR}"/${PN}-font.patch "${FILESDIR}"/${PN}-strip.patch "${FILESDIR}"/${PN}-usr.patch
+	use fox || epatch "${FILESDIR}"/${PN}-nogui.patch
 }
 
 src_compile() {
+	local BLAS=`pkg-config --libs blas`
+
+	if use fox; then
+		local FOX_INCLUDES=`WANT_FOX=1.6 fox-config --cflags`
+		local FOX_LIBS=`WANT_FOX=1.6 fox-config --libs`
+		emake -j1 GSL_LIBS="-lgsl ${BLAS}" FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}"
+	else
+		emake -j1 GSL_LIBS="-lgsl ${BLAS}"
+	fi
+
 	emake -j1 CFLAGS="${CFLAGS}"
+
 	if use doc; then
 		pushd doc/user-manual > /dev/null
 		emake -j1 html