Version bump

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 123 insertions, 3 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index 8654570b8575..b0a125301a68 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mathgl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.8 2009/09/15 04:37:30 grozin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.9 2010/01/04 12:02:51 grozin Exp $
+
+*mathgl-1.10 (04 Jan 2010)
+
+  04 Jan 2010; Andrey Grozin <grozin@gentoo.org> +mathgl-1.10.ebuild,
+  +files/mathgl-1.10-gcc43.patch:
+  Version bump
 
   15 Sep 2009; Andrey Grozin <grozin@gentoo.org> -mathgl-1.8.1.ebuild,
   -files/mathgl-1.8.1-gcc43.patch, -files/mathgl-1.8.1-gcc44.patch,
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index beff3eb7d95f..c0e2cffd6454 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,7 +1,10 @@
+AUX mathgl-1.10-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
 AUX mathgl-1.9.0.1-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
 AUX mathgl-1.9.0.1-hdf5.patch 2232 RMD160 73826c20a1e6504d6d510b9895f2bf8dc2c29e3d SHA1 bc87b61d9f113642a862d0b63e48aa984db32d2c SHA256 e7dc51c67e673ee1abd38bef980ccb929c6f787493e496a9c0ea7658d10be830
 DIST STIX_font.tgz 2450541 RMD160 7595c2b99c5982d72b1ef551ab8f9d65237e5466 SHA1 3cbc4f5090cd37d1b35d594150357550d2639f81 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe
+DIST mathgl-1.10.tgz 4474028 RMD160 8a9f938c921e287bb968fbb163e404d00e520f2e SHA1 f0a541c66fefd44336fea183c6ed97346eb15d03 SHA256 a3fdef1f035bfb7769ba8b9316279171ca0c19e20e238671dfabe4b17be3996f
 DIST mathgl-1.9.0.1.tgz 1897707 RMD160 a49e731dd432e83a63a53f6a1840cd2b7611773b SHA1 1fc6f0e0ac3ce951973ce595f939ad20730d2130 SHA256 34c84aa7b7d6fb98c4a95a72b9b04d0a69944279ee685980985138862120e493
+EBUILD mathgl-1.10.ebuild 2327 RMD160 e20a0a696c4df31ebed762d478722a877d8e516d SHA1 b3f5adeb966ccbbd3ba48c5f68a8bdbe30c8d32e SHA256 a7e144652e51518b5fd06df536925c11277ef08047d1727ed407f6808123d8c5
 EBUILD mathgl-1.9.0.1.ebuild 2484 RMD160 5dfdaf60c3dcc7e1136a75bf60bf197cfdc22060 SHA1 75d840c3c05273654ec63f5b1f10445cc7ad8b03 SHA256 02666517753322ffdee94d899525a96f8e1b3a592b58e7382beaab55c86cf0b8
-MISC ChangeLog 1806 RMD160 71ad9e0f3dcf36541242455510ad202111bf4623 SHA1 be805b5a4e19569db989bce70ec634a6b4bf4c22 SHA256 121785d6b412a4b7fec5d6ec8222742168a698258b92ec26f69a2b05c476aefc
+MISC ChangeLog 1954 RMD160 5fad630bc0e9456ccf0b4fb17c04a44cb2d69f86 SHA1 ad4057f9649457d878738d4c9a8569455f32a3dd SHA256 f4bf15a3d5715aac1c12cedde1a24d5e8ca064d7430ef0a0449615928b29450f
 MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42
diff --git a/sci-libs/mathgl/files/mathgl-1.10-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.10-gcc43.patch
new file mode 100644
index 000000000000..7a639bb9a4ab
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-1.10-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 <stdio.h>
+ #include <string.h>
++#include <cstdlib>
+ #include <locale.h>
+ #include <wchar.h>
+ #include "mgl/mgl_zb.h"
diff --git a/sci-libs/mathgl/mathgl-1.10.ebuild b/sci-libs/mathgl/mathgl-1.10.ebuild
new file mode 100644
index 000000000000..145e6cf1af05
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-1.10.ebuild
@@ -0,0 +1,101 @@
+# 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.ebuild,v 1.1 2010/01/04 12:02:51 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"
+
+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
+}
+
+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/arrayobject.h>|\"${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
+}