From 5a9ef13fdb4abee33a1bf1b6c97a2c065c88b2f2 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Thu, 22 May 2008 15:29:37 +0000 Subject: Version bump (Portage version: 2.1.5.2) --- dev-lang/gdl/ChangeLog | 8 ++- dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch | 31 ++++++++++++ dev-lang/gdl/gdl-0.9_pre5.ebuild | 75 ---------------------------- dev-lang/gdl/gdl-0.9_rc1.ebuild | 78 ++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 76 deletions(-) create mode 100644 dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch delete mode 100644 dev-lang/gdl/gdl-0.9_pre5.ebuild create mode 100644 dev-lang/gdl/gdl-0.9_rc1.ebuild (limited to 'dev-lang/gdl') diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog index 58eaffee74c3..b8f93a22639c 100644 --- a/dev-lang/gdl/ChangeLog +++ b/dev-lang/gdl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/gdl # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.6 2008/04/13 18:31:51 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.7 2008/05/22 15:29:37 bicatali Exp $ + +*gdl-0.9_rc1 (22 May 2008) + + 22 May 2008; Sébastien Fabbro + +files/gdl-0.9_rc1-proj4.patch, -gdl-0.9_pre5.ebuild, +gdl-0.9_rc1.ebuild: + Version bump 13 Apr 2008; Markus Dittrich +files/gdl-0.9_pre6-plplot-5.9.patch, gdl-0.9_pre6.ebuild: diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch b/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch new file mode 100644 index 000000000000..80227f317992 --- /dev/null +++ b/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch @@ -0,0 +1,31 @@ +--- configure.in.orig 2008-05-22 15:03:04.000000000 +0000 ++++ configure.in 2008-05-22 15:03:19.000000000 +0000 +@@ -482,14 +482,14 @@ + + if test "x$with_libproj4" != "xno"; then + if test "x$with_libproj4" != "xyes"; then +- LIBS="$LIBS -L$with_libproj4/lib -lproj4" ++ LIBS="$LIBS -L$with_libproj4/lib -lproj" + INCLUDES="$INCLUDES -I$with_libproj4/include" + else + INCLUDES="$INCLUDES -I/usr/include" +- LIBS="$LIBS -lproj4" ++ LIBS="$LIBS -lproj" + fi + +- AC_CHECK_LIB(proj4, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], [Define if you want to use LIBPROJ4])], [ ++ AC_CHECK_LIB(proj, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], [Define if you want to use LIBPROJ4])], [ + echo "" + echo "Error! LIBPROJ4 is required but was not found" + echo " Use --with-libproj4=DIR to specify the LIBPROJ4 directory tree" +--- src/math_utl.hpp.orig 2008-05-22 15:00:39.000000000 +0000 ++++ src/math_utl.hpp 2008-05-22 15:01:46.000000000 +0000 +@@ -42,7 +42,7 @@ + #define COMPLEX COMPLEX2 + + extern "C" { +-#include "lib_proj.h" ++#include + } + + PJ *map_init(); diff --git a/dev-lang/gdl/gdl-0.9_pre5.ebuild b/dev-lang/gdl/gdl-0.9_pre5.ebuild deleted file mode 100644 index ff1a83d6cceb..000000000000 --- a/dev-lang/gdl/gdl-0.9_pre5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre5.ebuild,v 1.2 2008/03/21 20:43:56 markusle Exp $ - -inherit eutils flag-o-matic - -MYP=${P/_/} -DESCRIPTION="An Interactive Data Language compatible incremental compiler" -LICENSE="GPL-2" -HOMEPAGE="http://gnudatalanguage.sourceforge.net/" -SRC_URI="mirror://sourceforge/gnudatalanguage/${MYP}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="python fftw hdf hdf5 netcdf imagemagick proj" - -RDEPEND=">=sys-libs/readline-4.3 - sci-libs/gsl - >=sci-libs/plplot-5.3 - imagemagick? ( media-gfx/imagemagick ) - hdf? ( sci-libs/hdf ) - hdf5? ( sci-libs/hdf5 ) - netcdf? ( sci-libs/netcdf ) - python? ( virtual/python - dev-python/numarray - dev-python/matplotlib ) - fftw? ( >=sci-libs/fftw-3 ) - proj? ( sci-libs/proj )" - -DEPEND="${RDEPEND} - sys-devel/libtool" - -S="${WORKDIR}/${MYP}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-proj4.patch -} - -src_compile() { - use proj && append-cppflags -DPJ_LIB__ - econf \ - $(use_with python) \ - $(use_with fftw) \ - $(use_with hdf) \ - $(use_with hdf5) \ - $(use_with netcdf) \ - $(use_with imagemagick Magick) \ - $(use_with proj libproj4) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_test() { - cd "${S}"/testsuite - PATH=${S}/src gdl < 99gdl - echo "GDL_PATH=/usr/share/${PN}" >> 99gdl - doenvd 99gdl -} diff --git a/dev-lang/gdl/gdl-0.9_rc1.ebuild b/dev-lang/gdl/gdl-0.9_rc1.ebuild new file mode 100644 index 000000000000..98151c57c454 --- /dev/null +++ b/dev-lang/gdl/gdl-0.9_rc1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc1.ebuild,v 1.1 2008/05/22 15:29:37 bicatali Exp $ + +inherit eutils flag-o-matic autotools + +MYP=${P/_/} +DESCRIPTION="An Interactive Data Language compatible incremental compiler" +LICENSE="GPL-2" +HOMEPAGE="http://gnudatalanguage.sourceforge.net/" +SRC_URI="mirror://sourceforge/gnudatalanguage/${MYP}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="python fftw hdf hdf5 netcdf imagemagick proj" + +RDEPEND=">=sys-libs/readline-4.3 + sci-libs/gsl + >=sci-libs/plplot-5.3 + imagemagick? ( media-gfx/imagemagick ) + hdf? ( sci-libs/hdf ) + hdf5? ( sci-libs/hdf5 ) + netcdf? ( sci-libs/netcdf ) + python? ( dev-python/numarray dev-python/matplotlib ) + fftw? ( >=sci-libs/fftw-3 ) + proj? ( sci-libs/proj )" + +DEPEND="${RDEPEND} + sys-devel/libtool" + +S="${WORKDIR}/${MYP}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-proj4.patch + epatch "${FILESDIR}"/${PN}-0.9_pre6-magick.patch + + #if has_version ">=sci-libs/plplot-5.9.0"; then + #epatch "${FILESDIR}"/${PN}-0.9_pre6-plplot-5.9.patch + #fi + eautoreconf +} + +src_compile() { + use proj && append-cppflags -DPJ_LIB__ + econf \ + $(use_with python) \ + $(use_with fftw) \ + $(use_with hdf) \ + $(use_with hdf5) \ + $(use_with netcdf) \ + $(use_with imagemagick Magick) \ + $(use_with proj libproj4) \ + || die "econf failed" + + emake || die "emake failed" +} + +src_test() { + cd "${S}"/testsuite + PATH="${S}"/src gdl <<-EOF + test_suite + EOF +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + insinto /usr/share/${PN} + doins -r src/pro src/py || die "install pro and py files failed" + dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING || die + + # add GDL provided routines to IDL_PATH + echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl + echo "GDL_PATH=/usr/share/${PN}" >> 99gdl + doenvd 99gdl +} -- cgit v1.2.3-65-gdbad