Version bump, fixing bug #263941

(Portage version: 2.2_rc29/cvs/Linux i686)

6 files changed, 106 insertions, 105 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index 6ed220ccf05f..be7606216895 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/mathgl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.3 2008/12/13 06:46:01 grozin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.4 2009/04/13 13:09:29 grozin Exp $
+
+*mathgl-1.8.1 (13 Apr 2009)
+
+  13 Apr 2009; Andrey Grozin <grozin@gentoo.org>
+  -files/mathgl-1.8-fltk.patch, -files/mathgl-1.8-octave.patch,
+  metadata.xml, -mathgl-1.8-r1.ebuild, +mathgl-1.8.1.ebuild:
+  Version bump, fixing bug #263941
 
   13 Dec 2008; Andrey Grozin <grozin@gentoo.org> -mathgl-1.8.ebuild:
   Cleaning
diff --git a/sci-libs/mathgl/files/mathgl-1.8-fltk.patch b/sci-libs/mathgl/files/mathgl-1.8-fltk.patch
deleted file mode 100644
index 102e13583136..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.8-fltk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: mathgl-1.8/examples/Makefile.am
-===================================================================
---- mathgl-1.8.orig/examples/Makefile.am
-+++ mathgl-1.8/examples/Makefile.am
-@@ -9,11 +9,13 @@ mgl_example_LDADD = $(top_builddir)/mgl/
- if USE_FLTK
- bin_PROGRAMS += mgl_fltk_example
- mgl_fltk_example_SOURCES = fltk_example.cpp
--mgl_fltk_example_LDADD = $(top_builddir)/widgets/libmgl-fltk.la
-+mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
-+mgl_fltk_example_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
- 
- check_PROGRAMS += test
- test_SOURCES = main.cpp
--test_LDADD = $(top_builddir)/widgets/libmgl-fltk.la
-+test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
-+test_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
- endif
- 
- if USE_GLUT
diff --git a/sci-libs/mathgl/files/mathgl-1.8-octave.patch b/sci-libs/mathgl/files/mathgl-1.8-octave.patch
deleted file mode 100644
index 0ee821b99682..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.8-octave.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: mathgl-1.8/configure.ac
-===================================================================
---- mathgl-1.8.orig/configure.ac
-+++ mathgl-1.8/configure.ac
-@@ -231,12 +231,14 @@ AC_ARG_ENABLE(octave,
-   *) AC_MSG_ERROR(bad value ${enableval} for --enable-octave) ;;
- esac],[octave=false])
- if (test x$langall = xtrue || test x$octave = xtrue) ;then
-+    AC_CHECK_PROG([OCTAVE],[octave-config],[octave-config])
- # find Octave arch
--    OCTAVE=octave
-     AC_MSG_CHECKING([for Octave arch])
--    OCTAVE_ARCH=`$OCTAVE -q --eval 'strcat(octave_config_info("canonical_host_type"), "-", octave_config_info("api_version"))'|sed -e 's/ans = //'`
-+    OCTAVE_ARCH=`$OCTAVE -p CANONICAL_HOST_TYPE`-`$OCTAVE -p API_VERSION`
-+    OCTAVE_INCFLAGS="-I`$OCTAVE -p OCTINCLUDEDIR`"
-     AC_MSG_RESULT([$OCTAVE_ARCH])
-     AC_SUBST(OCTAVE_ARCH,[$OCTAVE_ARCH])
-+    AC_SUBST(OCTAVE_INCFLAGS,[$OCTAVE_INCFLAGS])
-     test_octave=true
- fi
- AM_CONDITIONAL(USE_OCTAVE, test x$test_octave = xtrue )
diff --git a/sci-libs/mathgl/mathgl-1.8-r1.ebuild b/sci-libs/mathgl/mathgl-1.8-r1.ebuild
deleted file mode 100644
index ee579e799a34..000000000000
--- a/sci-libs/mathgl/mathgl-1.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8-r1.ebuild,v 1.1 2008/12/06 16:26:11 grozin Exp $
-EAPI=2
-WX_GTK_VER=2.8
-inherit autotools wxwidgets
-DESCRIPTION="Math Graphics Library"
-IUSE="doc fltk glut hdf5 jpeg octave python qt4 wxwindows"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-RDEPEND="sci-libs/gsl
-	media-libs/libpng
-	virtual/glu
-	glut? ( virtual/glut )
-	fltk? ( x11-libs/fltk )
-	jpeg? ( media-libs/jpeg )
-	hdf5? ( sci-libs/hdf5 )
-	octave? ( sci-mathematics/octave )
-	qt4? ( x11-libs/qt-gui:4 )
-	wxwindows? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig[python] )
-	octave? ( dev-lang/swig[octave] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-octave.patch
-	epatch "${FILESDIR}"/${P}-fltk.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwindows wx) \
-		$(use_enable fltk) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(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"
-}
diff --git a/sci-libs/mathgl/mathgl-1.8.1.ebuild b/sci-libs/mathgl/mathgl-1.8.1.ebuild
new file mode 100644
index 000000000000..45ed8095bd93
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-1.8.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8.1.ebuild,v 1.1 2009/04/13 13:09:29 grozin Exp $
+EAPI=2
+WX_GTK_VER=2.8
+inherit autotools wxwidgets python versionator toolchain-funcs
+DESCRIPTION="Math Graphics Library"
+IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwindows"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+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 )
+	gsl? ( sci-libs/gsl )
+	octave? ( sci-mathematics/octave )
+	qt4? ( x11-libs/qt-gui:4 )
+	wxwindows? ( x11-libs/wxGTK:2.8 )"
+
+DEPEND="${RDEPEND}
+	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
+}
+
+src_configure() {
+	econf --docdir="${ROOT}"usr/share/doc/${PF} \
+		$(use_enable glut) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwindows wx) \
+		$(use_enable fltk) \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		$(use_enable hdf5) \
+		$(use_enable python) \
+		$(use_enable octave) \
+		$(use_enable gsl) \
+		$(use_enable doc docs)
+}
+
+src_prepare() {
+	# 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/arrayobject.h>|\"${numpy_h}\"|" \
+			-i lang/numpy.i \
+			|| die "sed failed"
+	fi
+
+	eautoreconf
+}
+
+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
+}
diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index cd4c771e73ac..d0e39e80724a 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<maintainer>
-		<email>A.G.Grozin@inp.nsk.su</email>
+		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
 	<longdescription>Math Graphics Library</longdescription>