From 22705a692cedc6b64b9405757e383f4c13c2fa78 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Mon, 8 Mar 2010 18:13:36 +0000 Subject: Version bump (Portage version: 2.2_rc66/cvs/Linux i686) --- sci-libs/mathgl/ChangeLog | 9 +- sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch | 10 ++ sci-libs/mathgl/files/mathgl-1.9.0.1-gcc43.patch | 10 -- sci-libs/mathgl/files/mathgl-1.9.0.1-hdf5.patch | 55 ----------- sci-libs/mathgl/mathgl-1.10.1.ebuild | 112 +++++++++++++++++++++++ 5 files changed, 130 insertions(+), 66 deletions(-) create mode 100644 sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch delete mode 100644 sci-libs/mathgl/files/mathgl-1.9.0.1-gcc43.patch delete mode 100644 sci-libs/mathgl/files/mathgl-1.9.0.1-hdf5.patch create mode 100644 sci-libs/mathgl/mathgl-1.10.1.ebuild diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog index 7844e0f730a0..87d77a4617c1 100644 --- a/sci-libs/mathgl/ChangeLog +++ b/sci-libs/mathgl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/mathgl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.12 2010/02/12 04:20:46 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.13 2010/03/08 18:13:35 grozin Exp $ + +*mathgl-1.10.1 (09 Mar 2010) + + 09 Mar 2010; Andrey Grozin + -files/mathgl-1.9.0.1-gcc43.patch, -files/mathgl-1.9.0.1-hdf5.patch, + +mathgl-1.10.1.ebuild, +files/mathgl-1.10.1-gcc43.patch: + Version bump 12 Feb 2010; Sébastien Fabbro mathgl-1.10.ebuild: Removed mpi use flag in favor of checking if hdf5 was built with mpi, see diff --git a/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch new file mode 100644 index 000000000000..7a639bb9a4ab --- /dev/null +++ b/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch @@ -0,0 +1,10 @@ +--- utils/mgl2gif.cpp.ORIG 2009-03-04 14:22:12.000000000 +0100 ++++ utils/mgl2gif.cpp 2009-04-22 10:15:02.000000000 +0200 +@@ -19,6 +19,7 @@ + ***************************************************************************/ + #include + #include ++#include + #include + #include + #include "mgl/mgl_zb.h" diff --git a/sci-libs/mathgl/files/mathgl-1.9.0.1-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.9.0.1-gcc43.patch deleted file mode 100644 index 7a639bb9a4ab..000000000000 --- a/sci-libs/mathgl/files/mathgl-1.9.0.1-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/mgl2gif.cpp.ORIG 2009-03-04 14:22:12.000000000 +0100 -+++ utils/mgl2gif.cpp 2009-04-22 10:15:02.000000000 +0200 -@@ -19,6 +19,7 @@ - ***************************************************************************/ - #include - #include -+#include - #include - #include - #include "mgl/mgl_zb.h" diff --git a/sci-libs/mathgl/files/mathgl-1.9.0.1-hdf5.patch b/sci-libs/mathgl/files/mathgl-1.9.0.1-hdf5.patch deleted file mode 100644 index e0337f824dba..000000000000 --- a/sci-libs/mathgl/files/mathgl-1.9.0.1-hdf5.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- mathgl-1.9.0.1.orig/configure.ac 2009-07-08 11:29:13.000000000 +0200 -+++ mathgl-1.9.0.1/configure.ac 2009-08-26 11:09:55.123551155 +0200 -@@ -153,6 +153,7 @@ - - AC_CHECK_LIB([hdf5], [main], [(test x$all = xtrue || test x$hdf5 = xtrue) && HDF5_LIBS=-lhdf5 AC_SUBST(HDF5_LIBS)], - [(test x$all = xtrue || test x$hdf5 = xtrue) && echo "Please install hdf5 library" && exit]) -+AC_CHECK_LIB([hdf5], [H5Literate], [(test x$all = xtrue || test x$hdf5 = xtrue) && HDF5_FLAGS="-DHAVE_HDF5 -DHAVE_HDF5_18" AC_SUBST(HDF5_FLAGS)], []) - AM_CONDITIONAL(USE_HDF5, (test x$all = xtrue || test x$hdf5 = xtrue)) - - AC_ARG_ENABLE(gif, ---- mathgl-1.9.0.1.orig/mgl/mgl_data_io.cpp 2009-07-08 11:28:45.000000000 +0200 -+++ mathgl-1.9.0.1/mgl/mgl_data_io.cpp 2009-08-26 11:29:45.067804785 +0200 -@@ -919,7 +919,11 @@ - hid_t hf,hd,hs; - hsize_t dims[3]; - long rank = 3, res; -+#ifdef HAVE_HDF5_18 -+ H5Eset_auto(H5E_DEFAULT,0,0); -+#else - H5Eset_auto(0,0); -+#endif - res=H5Fis_hdf5(fname); - if(res>0 && !rewrite) hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT); - else hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); -@@ -929,10 +933,18 @@ - else { rank = 3; dims[0] = nz; dims[1] = ny; dims[2] = nx; } - hs = H5Screate_simple(rank, dims, 0); - #if(MGL_USE_DOUBLE==1) -+#ifdef HAVE_HDF5_18 -+ hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); -+#else /* ! HAVE_HDF5_18 */ - hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT); -+#endif /* HAVE_HDF5_18 */ - H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a); - #else -+#ifdef HAVE_HDF5_18 -+ hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); -+#else /* ! HAVE_HDF5_18 */ - hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT); -+#endif /* HAVE_HDF5_18 */ - H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a); - #endif - H5Dclose(hd); H5Sclose(hs); H5Fclose(hf); -@@ -944,7 +956,11 @@ - hsize_t dims[3]; - long rank; - hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT); -+#ifdef HAVE_HDF5_18 -+ hd = H5Dopen(hf,data,H5P_DEFAULT); -+#else - hd = H5Dopen(hf,data); -+#endif - hs = H5Dget_space(hd); - rank = H5Sget_simple_extent_ndims(hs); - if(rank>0 && rank<=3) diff --git a/sci-libs/mathgl/mathgl-1.10.1.ebuild b/sci-libs/mathgl/mathgl-1.10.1.ebuild new file mode 100644 index 000000000000..db749295ddd7 --- /dev/null +++ b/sci-libs/mathgl/mathgl-1.10.1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.1.ebuild,v 1.1 2010/03/08 18:13:35 grozin Exp $ + +EAPI=2 +WX_GTK_VER=2.8 +inherit autotools wxwidgets python versionator toolchain-funcs + +DESCRIPTION="Math Graphics Library" +HOMEPAGE="http://mathgl.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets" + +RDEPEND="media-libs/libpng + virtual/glu + python? ( dev-python/numpy ) + glut? ( virtual/glut ) + fltk? ( x11-libs/fltk:1.1 ) + gif? ( media-libs/giflib ) + jpeg? ( media-libs/jpeg ) + hdf5? ( >=sci-libs/hdf5-1.8 ) + gsl? ( sci-libs/gsl ) + octave? ( sci-mathematics/octave ) + qt4? ( x11-libs/qt-gui:4 ) + wxwidgets? ( x11-libs/wxGTK:2.8 )" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2.4 + doc? ( app-text/texi2html virtual/texi2dvi ) + python? ( dev-lang/swig ) + octave? ( dev-lang/swig )" + +pkg_setup() { + if ! version_is_at_least "4.3.0" "$(gcc-version)"; then + eerror "You need >=gcc-4.3.0 to compile this package" + die "Wrong gcc version" + fi + if use hdf5 && has_version sci-libs/hdf5[mpi]; then + export CC=mpicc + export CXX=mpicxx + fi +} + +src_unpack() { + unpack ${A} + mkdir "${S}"/fonts + cd "${S}"/fonts + unpack STIX_font.tgz +} + +src_prepare() { + # bug #267061 + epatch "${FILESDIR}"/${P}-gcc43.patch + + # correct location of numpy/arrayobject.h + if use python; then + local numpy_h + numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h + einfo "fixing numpy.i" + sed -e "s||\"${numpy_h}\"|" \ + -i lang/numpy.i \ + || die "sed failed" + fi + + eautoreconf +} + +src_configure() { + econf --docdir="${ROOT}"usr/share/doc/${PF} \ + $(use_enable glut) \ + $(use_enable qt4 qt) \ + $(use_enable wxwidgets wx) \ + $(use_enable fltk) \ + $(use_enable gif) \ + $(use_enable jpeg) \ + $(use_enable hdf5 hdf5_18) \ + $(use_enable python) \ + $(use_enable octave) \ + $(use_enable gsl) \ + $(use_enable doc docs) +} + +src_compile() { + # see bug #249627 + local JOBS + use doc && JOBS=-j1 + emake ${JOBS} || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc README AUTHORS || die "dodoc failed" +} + +pkg_postinst() { + if use octave; then + octave <<-EOF + pkg install /usr/share/${PN}/octave/${PN}.tar.gz + EOF + fi +} + +pkg_prerm() { + if use octave; then + octave <<-EOF + pkg uninstall ${PN} + EOF + fi +} -- cgit v1.2.3-65-gdbad