Fixing #67572

5 files changed, 20 insertions, 74 deletions

diff --git a/app-sci/yacas/ChangeLog b/app-sci/yacas/ChangeLog
index c972e34cfcbb..ea9c02a90d85 100644
--- a/app-sci/yacas/ChangeLog
+++ b/app-sci/yacas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/yacas
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/yacas/ChangeLog,v 1.10 2004/10/02 15:11:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/yacas/ChangeLog,v 1.11 2004/11/29 11:48:42 phosphan Exp $
+
+  29 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> -files/obsolete_cpp.patch:
+  Updated the patch for obsolete C++ stuff to work for gcc 3.4.3.
+  Patch moved to mirror system because of its size.
 
   06 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> -yacas-1.0.54.ebuild,
   -yacas-1.0.55.ebuild, yacas-1.0.56.ebuild:
diff --git a/app-sci/yacas/Manifest b/app-sci/yacas/Manifest
index ac9723220f3d..53cedb425791 100644
--- a/app-sci/yacas/Manifest
+++ b/app-sci/yacas/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 571ae400c21d8373dfdac10485b4f99c ChangeLog 1288
+MD5 59d5457cffd43efbc3551015540f4cac yacas-1.0.56.ebuild 1282
+MD5 bc0ca450b5f9d2518c1cd43f3d63d7a4 ChangeLog 1434
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 f9f95eb5ffa4cc2446c2ac1d6158465d yacas-1.0.56.ebuild 1169
-MD5 cf8261d2a6075743d63d67192ed50b7b files/digest-yacas-1.0.56 65
-MD5 64b45c5008b8d4664ead72296b23729e files/obsolete_cpp.patch 1155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsVDI1lqEGTUzyQRAv43AJ9UcH7MUam18JfNdOYKTE0k76QG4ACgo4Uq
-nuOtKXO3H7scuilieClzDGY=
-=ohMd
------END PGP SIGNATURE-----
+MD5 5c748030f6e6f803d4e272ce57a31361 files/digest-yacas-1.0.56 130
diff --git a/app-sci/yacas/files/digest-yacas-1.0.56 b/app-sci/yacas/files/digest-yacas-1.0.56
index f5b4350eb3cb..3e35c127116a 100644
--- a/app-sci/yacas/files/digest-yacas-1.0.56
+++ b/app-sci/yacas/files/digest-yacas-1.0.56
@@ -1 +1,2 @@
 MD5 cde348f0a4274e1f487b7483003cf119 yacas-1.0.56.tar.gz 1931182
+MD5 4f5a753ece3c7a8d57fa8c8f795200ae yacas-1.0.56.patch.bz2 5066
diff --git a/app-sci/yacas/files/obsolete_cpp.patch b/app-sci/yacas/files/obsolete_cpp.patch
deleted file mode 100644
index 3fd1ecca7217..000000000000
--- a/app-sci/yacas/files/obsolete_cpp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/gmpnumbers.cpp	2004-04-19 18:31:02.459711256 +0200
-+++ src/gmpnumbers.cpp.new	2004-04-19 18:35:49.982768353 +0200
-@@ -84,7 +84,7 @@
- {
-   mpz_t man;
-   mpz_init_set(man,y.man);
--  x.man = man;
-+  mpz_init_set(x.man,man);
-   x.exp = y.exp;
- }
- 
-@@ -92,7 +92,7 @@
- {
-   mpz_t man;
-   mpz_init_set_ui(man,y);
--  x.man = man;
-+  mpz_init_set(x.man,man);
-   x.exp = 0;
- }
- 
-@@ -100,7 +100,7 @@
- {
-   mpz_t man;
-   mpz_init_set(man,mpz);
--  x.man = man;
-+  mpz_init_set(x.man,man);
-   x.exp = 0;
- }
- 
-@@ -153,7 +153,7 @@
-   mpz_init_set_str(ma,man,10);
-   free(man);
-   if(neg)mpz_neg(ma,ma);
--  x.man=ma;
-+  mpz_init_set(x.man,ma);
-   x.exp=exp;
- }
- 
-@@ -170,7 +170,7 @@
-   free(str);
- }
- 
--char* getstrGMPNumber(GMPNumber& x, long prec=0)
-+char* getstrGMPNumber(GMPNumber& x, long prec)
- {
-   long rawsize = mpz_sizeinbase(x.man,10);
-   size_t size;
-@@ -241,7 +241,7 @@
- }
- 
- static LispStringPtr GMPNumberToString(GMPNumber& x, LispHashTable& h, 
--                                       LispInt prec=0)
-+                                       LispInt prec)
- {
-   char* result = getstrGMPNumber(x, prec);
-   LispStringPtr toreturn = h.LookUp(result);
diff --git a/app-sci/yacas/yacas-1.0.56.ebuild b/app-sci/yacas/yacas-1.0.56.ebuild
index 2dc2f59e1227..79e9fc343782 100644
--- a/app-sci/yacas/yacas-1.0.56.ebuild
+++ b/app-sci/yacas/yacas-1.0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/yacas/yacas-1.0.56.ebuild,v 1.5 2004/09/06 13:24:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/yacas/yacas-1.0.56.ebuild,v 1.6 2004/11/29 11:48:42 phosphan Exp $
 
 inherit eutils
 
@@ -8,7 +8,9 @@ IUSE="gmp"
 
 DESCRIPTION="very powerful general purpose Computer Algebra System"
 HOMEPAGE="http://yacas.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
+SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz
+		mirror://gentoo/${P}.patch.bz2
+		http://dev.gentoo.org/~phosphan/${P}.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -18,10 +20,16 @@ DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	gmp? ( >=dev-libs/gmp-4 ) "
 
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}.patch
+}
+
 src_compile() {
 	local myconf
 	if use gmp ; then
-		epatch ${FILESDIR}/obsolete_cpp.patch
 		myconf="--with-numlib=gmp"
 	fi
 	econf ${myconf} || die "./configure failed"