Fix building with GLIBC 2.10+ wrt #273969, thanks to Arttu Valo for patch.

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

4 files changed, 41 insertions, 4 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 09d54b2cc3b2..e95ebb25b0d3 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.27 2009/07/06 11:02:22 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.28 2009/08/09 16:09:21 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  singular-3.0.4.4.ebuild, +files/singular-3.0.4.4-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273969, thanks to Arttu Valo for patch.
 
   06 Jul 2009; Marijn Schouten <hkBst@gentoo.org> singular-3.0.4.4.ebuild:
   fix bug 276713 on behalf of ulm of the emacs team
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 3585e478ff17..39c43b91f884 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -4,6 +4,7 @@ AUX singular-3.0.1-gentoo.diff 4566 RMD160 cbfcd5c402b753c9a09b6e2961f2eaecf56b5
 AUX singular-3.0.1.2-gcc4.1-gentoo.patch 2603 RMD160 2b8ba6154bdd6e1a57f1093d966cb11874c05390 SHA1 45c479d1424993c8dc5a040dcaf58b91fc45d073 SHA256 748752eaddcbbcd181f50e497c8bdcb714f7a2f4434ddeacac679c6c0bc842e3
 AUX singular-3.0.4.2-gentoo.diff 4581 RMD160 9e775a3993730d88d1302679cfb38ca6c2121024 SHA1 b234a5047999dc6622965b13f8e25b1316ed4ceb SHA256 eb994b2a78c13e1a98c04d66b9a4ed980bcdfec828e6d1cc249d94b3a6bb5e9e
 AUX singular-3.0.4.4-emacs-22.patch 1482 RMD160 6f417ab3461219127358140c51d1352c34dabe99 SHA1 e9bad40cf79154870527498a1e2059a138aa6674 SHA256 0e17723d39a7b1ba395361dff2dc132b2b8463c4f41f7d7836539c99c64c8684
+AUX singular-3.0.4.4-glibc-2.10.patch 1358 RMD160 28237b86e691f1380ecd500ba7abbc9de0b1c3eb SHA1 c6d5586f26a2e2f56735814ef7285e3260782ed0 SHA256 0821e8901d8e208a22c396244fa0ba0c4cc4a2e276efc12948ea8139d50f5c13
 AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
 DIST Singular-3-0-1-2.tar.gz 10741252 RMD160 bcfb83fe7a57658865aa69fc526e01413fb3da81 SHA1 a95aa909bfa20145df0eb1a345ae1476116af5fd SHA256 3d50427b17cef0a2ac36d302bf7421a4cb06df24139d5386c64d14a07e7cd399
 DIST Singular-3-0-1-share.tar.gz 3909236 RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 SHA1 d7c07192707dbc6f916b3c5d704bae216f0834ff SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2
@@ -12,6 +13,6 @@ DIST Singular-3-0-4-2.tar.gz 15379506 RMD160 090733d6e48838070a8af63dd00c633852e
 DIST Singular-3-0-4-4.tar.gz 15388216 RMD160 2a1b8a78411c1fb4f884389143dff2fb52e6b92d SHA1 29fccaabc269e8e2816a397c22bd61c48cbcf651 SHA256 c579489f57a7f0838d475c2b6e63d3459089ddedd93d783168439cfaaf2c4cec
 EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
 EBUILD singular-3.0.4.2.ebuild 3827 RMD160 e8ffe96a6de0f85a18dadc85ef9e79f07c08bebe SHA1 edb2429e84b5048d5f6dc361b5c89dfe62efd031 SHA256 c1cef308acd2e6dd44287115f0f4f1b273c5e21406e487ed0759d95fdab103d1
-EBUILD singular-3.0.4.4.ebuild 4502 RMD160 98380b045555f9f9540c98204fdb7d99accc5a87 SHA1 140099992bb9d39518178f22197a4aeb7de01cdb SHA256 0e4175e438278fd5482f86e3473bf8f5cc22be2090f087525b0b738c88199673
-MISC ChangeLog 7666 RMD160 b19a5f4f9e9ac3c7243a72d4c7d29829379f7d58 SHA1 ef65d8a35dc98418518390aca77d9dd000a5ecc4 SHA256 2f3139eb628200a204dd9967751f39b3426f77f13c4200f692301be413798610
+EBUILD singular-3.0.4.4.ebuild 4550 RMD160 5b9749c4d519bf3b79863a48df6c14df0adb5ccb SHA1 91b720d14f948ebbbe38e5fce6ff983c54882f42 SHA256 663f324531daaddd369f75eaa0f337f1658d4eec806f58091af89d81cc5a0fc4
+MISC ChangeLog 7871 RMD160 c9939b7a1bff67a821c2ee9ec0caffdc8e73b77c SHA1 a7e425d9006f45a6f46af762e1bfa67392a3e105 SHA256 bd249f6272947320e46449ffa529e13672e5b973e6b0034e7128eabcbe25fb01
 MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch b/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch
new file mode 100644
index 000000000000..64525f4b30b5
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch
@@ -0,0 +1,31 @@
+diff -ur Singular-3-0-4.old/kernel/febase.cc Singular-3-0-4/kernel/febase.cc
+--- Singular-3-0-4.old/kernel/febase.cc	2009-07-07 01:15:49.088761926 +0300
++++ Singular-3-0-4/kernel/febase.cc	2009-07-07 01:16:51.157012952 +0300
+@@ -743,13 +743,13 @@
+       char* dir_sep;
+       struct passwd *pw_entry;
+       strcpy (longpath, path);
+-      dir_sep = strchr(longpath, DIR_SEP);
++      dir_sep = const_cast<char*> ( strchr(longpath, DIR_SEP) );  // TODO: fix the ugly casting away of const
+       *dir_sep = '\0';
+       pw_entry = getpwnam(&longpath[1]);
+       if (pw_entry != NULL)
+       {
+         strcpy(longpath, pw_entry->pw_dir);
+-        dir_sep = strchr(path, DIR_SEP);
++        dir_sep = const_cast<char*> ( strchr(path, DIR_SEP) );  // TODO: fix the ugly casting away of const
+         strcat(longpath, dir_sep);
+         path = longpath;
+       }
+diff -ur Singular-3-0-4.old/kernel/mpr_complex.cc Singular-3-0-4/kernel/mpr_complex.cc
+--- Singular-3-0-4.old/kernel/mpr_complex.cc	2009-07-07 01:34:11.290760532 +0300
++++ Singular-3-0-4/kernel/mpr_complex.cc	2009-07-07 01:55:24.209129950 +0300
+@@ -82,7 +82,7 @@
+   BOOLEAN neg=false;
+   if (*in == '-') { in++; neg=TRUE; }
+   char *s;
+-  if ((s=strchr(in,'E')) !=NULL)
++  if ((s = const_cast<char*> ( strchr(in,'E') )) !=NULL)  /* TODO: fix the ugly casting away of const */
+   {
+     *s='e';
+   }
diff --git a/sci-mathematics/singular/singular-3.0.4.4.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
index a7f835ccb8f2..cfae78c8e636 100644
--- a/sci-mathematics/singular/singular-3.0.4.4.ebuild
+++ b/sci-mathematics/singular/singular-3.0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.3 2009/07/06 11:02:22 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.4 2009/08/09 16:09:21 ssuominen Exp $
 
 inherit eutils elisp-common flag-o-matic autotools multilib versionator
 
@@ -47,6 +47,7 @@ src_unpack () {
 	epatch "${FILESDIR}"/${PN}-3.0.4.2-gentoo.diff
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	epatch "${FILESDIR}"/${P}-emacs-22.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 
 	# for some unknown reason this ldflag causes the
 	# build system to choke