From 4a62f73d98e314d50dd28228f47b4af2aecd2e94 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Fri, 30 Nov 2012 17:34:03 +0000 Subject: Version bump (Portage version: 2.2.0_alpha142/cvs/Linux i686, unsigned Manifest commit) --- sci-mathematics/gsl-shell/ChangeLog | 8 +++- .../gsl-shell/files/gsl-shell-font.patch | 17 +++---- sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild | 55 +++++++++++++++++++++ .../gsl-shell/gsl-shell-2.2.0_beta1.ebuild | 56 ---------------------- 4 files changed, 69 insertions(+), 67 deletions(-) create mode 100644 sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild delete mode 100644 sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild (limited to 'sci-mathematics/gsl-shell') diff --git a/sci-mathematics/gsl-shell/ChangeLog b/sci-mathematics/gsl-shell/ChangeLog index d72e6f5dc2d5..183dec97e462 100644 --- a/sci-mathematics/gsl-shell/ChangeLog +++ b/sci-mathematics/gsl-shell/ChangeLog @@ -1,6 +1,12 @@ # 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.5 2012/09/26 14:50:50 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.6 2012/11/30 17:34:03 grozin Exp $ + +*gsl-shell-2.2.0 (30 Nov 2012) + + 30 Nov 2012; Andrey Grozin -gsl-shell-2.2.0_beta1.ebuild, + +gsl-shell-2.2.0.ebuild, files/gsl-shell-font.patch: + Version bump 26 Sep 2012; Andrey Grozin gsl-shell-2.2.0_beta1.ebuild: Fixing a stupid typo diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch index 0511b26b8af8..d8879497c4cd 100644 --- a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch +++ b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch @@ -1,13 +1,10 @@ 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 @@ - +--- gsl-shell.orig/agg-plot/support_x11.cpp 2012-11-27 04:55:38.000000000 +0700 ++++ gsl-shell/agg-plot/support_x11.cpp 2012-11-30 23:02:31.000000000 +0700 +@@ -9,4 +9,4 @@ + #else -const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont/FreeSans.ttf", "ttf-dejavu/DejaVuSans.ttf", 0}; +-#define TTF_SYSTEM_DIR "/usr/share/fonts/truetype/" +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); ++#define TTF_SYSTEM_DIR "/usr/share/fonts/" + #define CONSOLE_FONT_NAME "monospace" diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild new file mode 100644 index 000000000000..4896cf682781 --- /dev/null +++ b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild @@ -0,0 +1,55 @@ +# 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.ebuild,v 1.1 2012/11/30 17:34:03 grozin Exp $ + +EAPI=4 +inherit eutils + +DESCRIPTION="Lua interactive shell for sci-libs/gsl" +HOMEPAGE="http://www.nongnu.org/gsl-shell/" +SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~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 + || ( 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}" + +S="${WORKDIR}"/${PN} + +src_prepare() { + 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 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" \ + FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}" + else + emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" + fi + + 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/* +} 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 deleted file mode 100644 index 5c950e666049..000000000000 --- a/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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.5 2012/09/26 14:50:50 grozin Exp $ - -EAPI=4 -inherit eutils versionator - -DESCRIPTION="Lua interactive shell for sci-libs/gsl" -HOMEPAGE="http://www.nongnu.org/gsl-shell/" -MY_P=$(version_format_string '${PN}-$1.$2.$3-$4') -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -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 - || ( 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}" - -S="${WORKDIR}" - -src_prepare() { - 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 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" \ - FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}" - else - emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" - fi - - 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/* -} -- cgit v1.2.3-65-gdbad