New USE flag doc; build with USE=-fox fixed

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

4 files changed, 47 insertions, 5 deletions

diff --git a/sci-mathematics/gsl-shell/ChangeLog b/sci-mathematics/gsl-shell/ChangeLog
index 3fb72430bf7e..aa5514833b6b 100644
--- a/sci-mathematics/gsl-shell/ChangeLog
+++ b/sci-mathematics/gsl-shell/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1 2012/09/20 16:09:24 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.2 2012/09/21 13:26:41 grozin Exp $
+
+  21 Sep 2012; Andrey Grozin <grozin@gentoo.org> gsl-shell-2.2.0_beta1.ebuild,
+  +files/gsl-shell-nogui.patch:
+  New USE flag doc; build with USE=-fox fixed
 
 *gsl-shell-2.2.0_beta1 (20 Sep 2012)
 
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index dd25e6e1560a..00ba2ae8bd98 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,5 +1,6 @@
+AUX gsl-shell-nogui.patch 809 SHA256 6243647228918d4cdde4e1360ca0b7a7b4577b35044043db5d48a84333aea15d SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409 WHIRLPOOL ca0c1822b51fc7d0c78c6249790af8ae0018618055fa4ef1e8e775d3dd685aa26258c0120a79903dd40ef721a35f60b09beefe0ef31c626aa9738e376214ef21
 AUX gsl-shell.patch 1800 SHA256 e69d11e6ae947c10ebc0b575163c3f4896f877321165beae88949d35d54b18be SHA512 f1efb6fb6368d8f67b5c11da24ecc87aa94d015f5d3aa59788e45d1c9f111c3ae3533e1ac54b3da17d58ba4d2807c0d66b8422d23ad5e7dc3cd7899b69c0e729 WHIRLPOOL d92e38fba0ad7eb85fc6d8f6bd3a6f5b88cd21a254b2a3b0396c4de9951bc8d5472f3fc0511e532d7cbbc054f32192e4a2ee29efcbacbe8ec2b16f2492333b53
 DIST gsl-shell-2.2.0-beta1.tar.gz 3118614 SHA256 abd28a452db9185334891093eff8a0cfe7daa6f8a5f5cf5a6f85e5bb8b209712 SHA512 3f97731ac96eaa283be34a38e5895a453226e0e3d7521bc764814e8cba89ddaecbbbff6b9c8363383f445a34e675b82a5cb8a71caded24ddc44c1036bfdf1722 WHIRLPOOL 428e3f789e0aa9b41d368acb7c1834bbbe1d87aa141effaca169f3413566e739b23e400c06a7a7dc2436f902336ea7dddcdf10cf53913115849582a999d380df
-EBUILD gsl-shell-2.2.0_beta1.ebuild 891 SHA256 ac1c83d81e24e17a36a886965aebf31626748c61426d9ae51a839d64a66b9a38 SHA512 627d105265187cbc41db13809690ef69bc397486d0df98fdfc331aafe83e0f7356cf51dc760aa974bc20579752df709809141966a7a7744457b3b96868bb50c0 WHIRLPOOL a3e1c839cff0b3cbf2fa21fa39463a3c0ed30eefa43809840426c45215cfdf1ba68eebc901f5c1441c5e3a893585fe3fe02d8449bfb6fbbbc3820f9080b1f083
-MISC ChangeLog 400 SHA256 c25349b1d00bac6b29730804de4f6f5550058b21551b0efb44ef945f08796d0b SHA512 0355474e8a88d38cf04be53ea32ea191df9ce4215debae886c7254e9be8905b235010512966c08dc1a47bce41ee1121eea9bd9e5174eda41c2c4f85a6c8c77f3 WHIRLPOOL 43c803f557f97e8f6f1937410fe92432089ad82cc6ab646e372f6909d13b2d202ef1d8bf210f7d95dd46fbdc42d5e0335b191e30447ffab1eb702ef8fa9654b9
+EBUILD gsl-shell-2.2.0_beta1.ebuild 1155 SHA256 70b89c9d4783fcf52b26a57f558bd3bae982ea0651bc7c7a8250785e1eedd156 SHA512 fdbf2711efe38dd989901a4891b4dcca97e81de857c4b0beefbcb6a6bb3995965ef2433c14b27a222a94569aae2c5c975cef3e846cd01f9bc61af77dc20a4a07 WHIRLPOOL 4ad3157c060cf2503ca029adc2c5dcffc70837d9de838774f9d5669b7ba3a128ae5da910791529edf2d81773c4a51f47c0ed08c90f60c18058877f93ce65e05c
+MISC ChangeLog 558 SHA256 f3163ea8ae57b8d51a7256c936b1fc8ad14d5050c9cb9e78dbde6238d19f57c6 SHA512 f15009db5764ffd998cfdd99beb5c92576d45dea191eb5edb50d496d45826b9be07f545be1ed88dafd5e1133b1ef9e1cea4286426b57fa218ee1d571a9ae0e2d WHIRLPOOL 42861b495cbdd0a5b1ad4f0c6fb2683cf416b2ff807f6a5e8acb93b9602511474893cb2630d07e8450a8116a8475d82ab1403d74cfe19a264cb7bc1887a2e56f
 MISC metadata.xml 827 SHA256 d2543b251374761d9c167a544656ad1164bf09e67c0774686c4ce47834739441 SHA512 0bb6d572f8def7438bacc3f883dac17b24382c7a3e10ca2a4843bd03db600399f40090cb1f6631d4759a6cc7d2709029d581bcc29f8373e713e95b86c3ff6e75 WHIRLPOOL cbc5d970895409148686055e3ee5b4ee879c0ad7e33ce166d375c76a6546dd23f9515144421398e4e88f99714190e30a2327286c79158a1d7831576bb864095c
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch b/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch
new file mode 100644
index 000000000000..16d3eb0f04d2
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch
@@ -0,0 +1,25 @@
+diff -r -U1 gsl-shell.orig/Makefile gsl-shell/Makefile
+--- gsl-shell.orig/Makefile	2012-09-21 19:54:05.000000000 +0700
++++ gsl-shell/Makefile	2012-09-21 19:53:37.000000000 +0700
+@@ -29,3 +29,2 @@
+ GSL_SHELL = gsl-shell$(EXE_EXT)
+-GSL_SHELL_GUI = gsl-shell-gui$(EXE_EXT)
+ LUA_CFLAGS = -I$(LUADIR)/src
+@@ -73,4 +72,3 @@
+ INCLUDES += $(PTHREADS_CFLAGS) -Iagg-plot
+-GUI_SUBDIR = fox-gui
+-SUBDIRS += agg-plot $(GUI_SUBDIR)
++SUBDIRS += agg-plot
+ LUAGSL_LIBS += agg-plot/libaggplot.a
+@@ -105,6 +103,5 @@
+ 
+-install: $(GSL_SHELL) $(GUI_SUBDIR)
++install: $(GSL_SHELL)
+ 	mkdir -p $(INSTALL_BIN_DIR)
+ 	cp $(GSL_SHELL) $(INSTALL_BIN_DIR)
+-	cp fox-gui/$(GSL_SHELL_GUI) $(INSTALL_BIN_DIR)
+ 	mkdir -p $(INSTALL_LIB_DIR)
+@@ -122,3 +119,2 @@
+ 	$(MAKE) -C $(LUADIR) clean
+-	$(MAKE) -C fox-gui clean
+ 	$(HOST_RM) *.o $(TARGETS)
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 330339890dea..b51644621cae 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.1 2012/09/20 16:09:24 grozin Exp $
+# $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 $
 
 EAPI=4
 inherit eutils versionator
@@ -12,13 +12,14 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="fox"
+IUSE="doc fox"
 
 DEPEND=">=sci-libs/gsl-1.14
 	>=x11-libs/agg-2.5
 	>=media-libs/freetype-2.4.10
 	sys-libs/readline
 	|| ( media-fonts/ubuntu-font-family media-fonts/freefont-ttf media-fonts/dejavu )
+	doc? ( dev-python/sphinx[latex] )
 	fox? ( x11-libs/fox:1.6 )"
 RDEPEND="${DEPEND}"
 
@@ -26,8 +27,19 @@ S="${WORKDIR}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}.patch"
+	use fox || epatch "${FILESDIR}/${PN}-nogui.patch"
 }
 
 src_compile() {
 	emake -j1 CFLAGS="${CFLAGS}"
+	if use doc; then
+		pushd doc/user-manual > /dev/null
+		emake -j1 html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+	use doc && dohtml -r doc/user-manual/_build/html/*
 }