Fixing blas dependency, restructuring patches

Package-Manager: portage-2.2.0_alpha131/cvs/Linux i686

7 files changed, 55 insertions, 46 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/Manifest b/sci-mathematics/gsl-shell/Manifest
index 00ba2ae8bd98..cdec2f5816c6 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,6 +1,8 @@
+AUX gsl-shell-font.patch 665 SHA256 bdd4035013ac338018bb0c964c1b749e7c7c2c035e8887a481719e661b2399c1 SHA512 0a25aa7137bb08d60f708d376e0b17e4d90dffbc56f2405424e2443629862a84fc08619e47a6fa627296a782cfc089e6f929f3a99eaea1fac2b4647e9497efb9 WHIRLPOOL 638794f2874d4f9642a75197de0b02e3fc228357ff7ae37e7a6789cd2c11b261a23db466e77205ed28179b230d7fca27c6df4b7130f3d43b608a2d9015a6f44b
 AUX gsl-shell-nogui.patch 809 SHA256 6243647228918d4cdde4e1360ca0b7a7b4577b35044043db5d48a84333aea15d SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409 WHIRLPOOL ca0c1822b51fc7d0c78c6249790af8ae0018618055fa4ef1e8e775d3dd685aa26258c0120a79903dd40ef721a35f60b09beefe0ef31c626aa9738e376214ef21
-AUX gsl-shell.patch 1800 SHA256 e69d11e6ae947c10ebc0b575163c3f4896f877321165beae88949d35d54b18be SHA512 f1efb6fb6368d8f67b5c11da24ecc87aa94d015f5d3aa59788e45d1c9f111c3ae3533e1ac54b3da17d58ba4d2807c0d66b8422d23ad5e7dc3cd7899b69c0e729 WHIRLPOOL d92e38fba0ad7eb85fc6d8f6bd3a6f5b88cd21a254b2a3b0396c4de9951bc8d5472f3fc0511e532d7cbbc054f32192e4a2ee29efcbacbe8ec2b16f2492333b53
+AUX gsl-shell-strip.patch 361 SHA256 b055fda96fa65658ff73143c5ab2242fabf2ff90e9a01da57758cf073f48de86 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf WHIRLPOOL 56ceab90c029426a1697a77c37049b275996d8ebbbf13d5f7e5a20d2dd8c5167ba3a034ff6071b3dab741ef1286d1692b84e3e99b5cd223af98fd74712f08f0d
+AUX gsl-shell-usr.patch 250 SHA256 e0199baa0018dc68f1eef3d51d6fcd8f501725ee9f368446a1312608e6dbed28 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3 WHIRLPOOL f586cb39b7e585a0949a61dffe36274285f64f22d428439c1c281e942d9a8cd3dee660a79891d4615402a90e7ddc7b113a36ded05f917ca8cf1e634f42f7b1ae
 DIST gsl-shell-2.2.0-beta1.tar.gz 3118614 SHA256 abd28a452db9185334891093eff8a0cfe7daa6f8a5f5cf5a6f85e5bb8b209712 SHA512 3f97731ac96eaa283be34a38e5895a453226e0e3d7521bc764814e8cba89ddaecbbbff6b9c8363383f445a34e675b82a5cb8a71caded24ddc44c1036bfdf1722 WHIRLPOOL 428e3f789e0aa9b41d368acb7c1834bbbe1d87aa141effaca169f3413566e739b23e400c06a7a7dc2436f902336ea7dddcdf10cf53913115849582a999d380df
-EBUILD gsl-shell-2.2.0_beta1.ebuild 1155 SHA256 70b89c9d4783fcf52b26a57f558bd3bae982ea0651bc7c7a8250785e1eedd156 SHA512 fdbf2711efe38dd989901a4891b4dcca97e81de857c4b0beefbcb6a6bb3995965ef2433c14b27a222a94569aae2c5c975cef3e846cd01f9bc61af77dc20a4a07 WHIRLPOOL 4ad3157c060cf2503ca029adc2c5dcffc70837d9de838774f9d5669b7ba3a128ae5da910791529edf2d81773c4a51f47c0ed08c90f60c18058877f93ce65e05c
-MISC ChangeLog 558 SHA256 f3163ea8ae57b8d51a7256c936b1fc8ad14d5050c9cb9e78dbde6238d19f57c6 SHA512 f15009db5764ffd998cfdd99beb5c92576d45dea191eb5edb50d496d45826b9be07f545be1ed88dafd5e1133b1ef9e1cea4286426b57fa218ee1d571a9ae0e2d WHIRLPOOL 42861b495cbdd0a5b1ad4f0c6fb2683cf416b2ff807f6a5e8acb93b9602511474893cb2630d07e8450a8116a8475d82ab1403d74cfe19a264cb7bc1887a2e56f
+EBUILD gsl-shell-2.2.0_beta1.ebuild 1538 SHA256 adb048dc5321d3c60b1641e5ef59044de51460a8e288b09af7a0a2754da79ce6 SHA512 fa285da4a5e7dea1987ad4e73b4170fea6446555d4260536084026c3f876c6bf5705486f5bfdb542cfbca12ce201f117f1c5b36ac52aa2846be96d72d922409e WHIRLPOOL f91186a71ebcc1559e50d790c37f05311ca6d6260bf1f792fe9a8ffdb818860d0c3a5f73bbcefaac0ccd7a325e41efec118c4a72c04252b1cabf8492b0c80715
+MISC ChangeLog 801 SHA256 aff2174a59e03cad541b2968d1f583d554109aeaf10272ccce75a6da7000800b SHA512 326dc498b930ec7655c4bda13db6dc417ab699fae24475c8f95d2691f19bd1163ffc54418433996442b2734b8d42de3d27316ddef1c1d08d3eb476aebd0a41f3 WHIRLPOOL 2347fbafd2cacb7d1db2b567245e6b7d2adeee90842d02ca9aa6f6622e12734c45335ae03328a8af7b5a303f2f961164abdfc2bdb78e46614df7e1f8d70e8179
 MISC metadata.xml 827 SHA256 d2543b251374761d9c167a544656ad1164bf09e67c0774686c4ce47834739441 SHA512 0bb6d572f8def7438bacc3f883dac17b24382c7a3e10ca2a4843bd03db600399f40090cb1f6631d4759a6cc7d2709029d581bcc29f8373e713e95b86c3ff6e75 WHIRLPOOL cbc5d970895409148686055e3ee5b4ee879c0ad7e33ce166d375c76a6546dd23f9515144421398e4e88f99714190e30a2327286c79158a1d7831576bb864095c
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