Fix building with GLIBC 2.10+ wrt #274282.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 38 insertions, 9 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index b06debd10bac..02c1c01ceddf 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2009/04/24 19:08:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.6 2009/08/09 13:35:22 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mathgl-1.8.1.ebuild,
+  +files/mathgl-1.8.1-gcc44.patch:
+  Fix building with GLIBC 2.10+ wrt #274282.
 
   24 Apr 2009; Andrey Grozin <grozin@gentoo.org>
   +files/mathgl-1.8.1-gcc43.patch, mathgl-1.8.1:
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index e095bb15c58b..2a1d5ef66bf0 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,5 +1,6 @@
 AUX mathgl-1.8.1-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
+AUX mathgl-1.8.1-gcc44.patch 723 RMD160 8b293d760821c1ca0534545495581c3db4b53048 SHA1 67e26c391c002764a85cf3f4042dfabc08e692a3 SHA256 b1bc7eca4a785fdde06010e73795b515d5939519999a7e7d89b144b31e067d10
 DIST mathgl-1.8.1.tgz 8288534 RMD160 402cc7fe15b81255189764d7f9ed64fbd5987251 SHA1 307153645a514b071c192b883153f6aa8d9ad52f SHA256 0f4065d5052e1e1f5a1af9284acbfcd249012ff71bfa1a03724d24f791d7c48f
-EBUILD mathgl-1.8.1.ebuild 2278 RMD160 304fe4f4d14bc0cc0cf8b0a92a5ca6f6052c9e95 SHA1 35e7de9ed73a0579b0615b19a6c7a622b668cee7 SHA256 94df03c6c21595cd0a042e7ea5d6d5ad20c9919af8af7a0d17f1e4b72aefa785
-MISC ChangeLog 1039 RMD160 cf2100052eaa8fd00b6e3292666c0a2ef647857e SHA1 12926a140119e2b06aa32d92aa750a2aa58139c7 SHA256 a3a7fe650a5288224f4742b0470f599d3d61ffbc0be693ccda61ee43e22dd996
+EBUILD mathgl-1.8.1.ebuild 2342 RMD160 669f4d4b39b147af37f4585afae1f56249810824 SHA1 9b6fdd392ab3e2d8e1120581cf4654b580ab1351 SHA256 35246a700ac06c0ce53a29b9d702ff04ef130a484a55befcdb1da90bb00d068f
+MISC ChangeLog 1198 RMD160 808aa9a9f280ec8e4cd25848cebed911f2ab8a53 SHA1 502e4bee92b4f0ab7fbd3556292c705609db85d9 SHA256 5b12277011e11967c6b2fcf1c07c5ffa9bd2ce7ddf8d946b522b4e8323e2666c
 MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42
diff --git a/sci-libs/mathgl/files/mathgl-1.8.1-gcc44.patch b/sci-libs/mathgl/files/mathgl-1.8.1-gcc44.patch
new file mode 100644
index 000000000000..58eac42ce025
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-1.8.1-gcc44.patch
@@ -0,0 +1,21 @@
+diff -ur mathgl-1.8.1.orig/mgl/mgl_addon.cpp mathgl-1.8.1/mgl/mgl_addon.cpp
+--- mathgl-1.8.1.orig/mgl/mgl_addon.cpp	2009-03-04 15:22:03.000000000 +0200
++++ mathgl-1.8.1/mgl/mgl_addon.cpp	2009-08-09 16:33:40.000000000 +0300
+@@ -28,7 +28,7 @@
+ //---------------------------------------------------------------------------
+ int mgl_strpos(const char *str,char *fnd)
+ {
+-	char *p=strstr(str,fnd);
++	const char *p=strstr(str,fnd);
+ 	int res;
+ 	if(p)	res = p-str;
+ 	else	res = -1;
+@@ -37,7 +37,7 @@
+ //---------------------------------------------------------------------------
+ int mgl_strpos(const char *str,char ch)
+ {
+-	char *p=strchr(str,ch);
++	const char *p=strchr(str,ch);
+ 	int res;
+ 	if(p)	res = p-str;
+ 	else	res = -1;
diff --git a/sci-libs/mathgl/mathgl-1.8.1.ebuild b/sci-libs/mathgl/mathgl-1.8.1.ebuild
index 8a009ade15d9..32f9996c49f1 100644
--- a/sci-libs/mathgl/mathgl-1.8.1.ebuild
+++ b/sci-libs/mathgl/mathgl-1.8.1.ebuild
@@ -1,17 +1,19 @@
 # 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.2 2009/04/24 19:08:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8.1.ebuild,v 1.3 2009/08/09 13:35:22 ssuominen 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/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwindows"
 
 RDEPEND="media-libs/libpng
 	virtual/glu
@@ -25,7 +27,6 @@ RDEPEND="media-libs/libpng
 	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 )
@@ -41,6 +42,8 @@ pkg_setup() {
 src_prepare() {
 	# bug #267061
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	# bug 274282
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	# correct location of numpy/arrayobject.h
 	if use python; then