Fixed #104122 with a little patch. Marking ~arch for x86 and ppc.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 53 insertions, 5 deletions

diff --git a/sci-electronics/freehdl/ChangeLog b/sci-electronics/freehdl/ChangeLog
index 8fb33fdd639c..02d2fc333419 100644
--- a/sci-electronics/freehdl/ChangeLog
+++ b/sci-electronics/freehdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/freehdl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/freehdl/ChangeLog,v 1.4 2005/08/29 12:05:36 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/freehdl/ChangeLog,v 1.5 2005/08/30 12:44:04 phosphan Exp $
+
+  30 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/freehdl-20050510-memory.patch, freehdl-20050510.ebuild:
+  Fixed #104122 with a little patch. Marking ~arch for x86 and ppc.
 
 *freehdl-20050510 (29 Aug 2005)
 
diff --git a/sci-electronics/freehdl/Manifest b/sci-electronics/freehdl/Manifest
index 508546d3d501..45cbaaee6f4e 100644
--- a/sci-electronics/freehdl/Manifest
+++ b/sci-electronics/freehdl/Manifest
@@ -1,7 +1,8 @@
 MD5 fcb38350931101708a835d74b715fd25 freehdl-20040113.ebuild 706
-MD5 c49df4abbe0469cbd97ae7c057ddcb00 ChangeLog 1235
+MD5 e7208d7b7b413317c7170c7c14ca66b1 ChangeLog 1422
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 7b3f2470a22891a35b86583bb52463f8 freehdl-20050510.ebuild 1014
+MD5 3449ec710434a38319e549e37f76e102 freehdl-20050510.ebuild 1049
+MD5 57286a737eaaae05980234e90e7a86c1 files/freehdl-20050510-memory.patch 1291
 MD5 a5da60bdf2fc896ba518737305f59a4d files/digest-freehdl-20040113 69
 MD5 2bc93cfb25f83afd2a43e5948dcc9891 files/digest-freehdl-20050510 69
 MD5 d07d33aebd4d5adb56d7c24dbe9c0f78 files/freehdl-20040113-gcc3.4.patch 16484
diff --git a/sci-electronics/freehdl/files/freehdl-20050510-memory.patch b/sci-electronics/freehdl/files/freehdl-20050510-memory.patch
new file mode 100644
index 000000000000..dc72acd31bf2
--- /dev/null
+++ b/sci-electronics/freehdl/files/freehdl-20050510-memory.patch
@@ -0,0 +1,42 @@
+diff -ru freehdl-20050510/fire/tree-supp.cc freehdl-20050510-new/fire/tree-supp.cc
+--- freehdl-20050510/fire/tree-supp.cc	2000-03-31 19:52:44.000000000 +0200
++++ freehdl-20050510-new/fire/tree-supp.cc	2005-08-30 14:31:16.000000000 +0200
+@@ -37,8 +37,6 @@
+ {
+   if (proptab)
+     {
+-      for (int i = 0; i < proptab->n_props; i++)
+-	delete proptab->props[i];
+       delete proptab;
+     }
+ }
+@@ -49,7 +47,7 @@
+   if (proptab == NULL || key >= proptab->n_props)
+     {
+       tree_prop_tab *new_proptab = (tree_prop_tab *)
+-	new char[(sizeof(tree_prop_tab) + key*sizeof(tree_prop*))];
++	operator new(sizeof(tree_prop_tab) + key*sizeof(tree_prop*));
+       int old_size;
+       if (proptab)
+ 	{
+@@ -462,7 +460,7 @@
+ operator new (size_t size, tree_histogram *hist)
+ {
+   hist->enter (size);
+-  return (void *)new char[size];
++  return operator new(size);
+ }
+ 
+ tree_histogram::tree_histogram ()
+diff -ru freehdl-20050510/v2cc/v2cc.cc freehdl-20050510-new/v2cc/v2cc.cc
+--- freehdl-20050510/v2cc/v2cc.cc	2005-02-15 11:03:01.000000000 +0100
++++ freehdl-20050510-new/v2cc/v2cc.cc	2005-08-30 14:32:34.000000000 +0200
+@@ -508,7 +508,7 @@
+       if (dependencies_file && du && !du->is_error ())
+ 	fprintf (dependencies_file, " %s", fn);
+ 
+-      delete fn;
++      delete[] fn;
+     }
+ 
+   return du;
diff --git a/sci-electronics/freehdl/freehdl-20050510.ebuild b/sci-electronics/freehdl/freehdl-20050510.ebuild
index 2fc5c0aa820f..c4f644ced45a 100644
--- a/sci-electronics/freehdl/freehdl-20050510.ebuild
+++ b/sci-electronics/freehdl/freehdl-20050510.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/freehdl/freehdl-20050510.ebuild,v 1.1 2005/08/29 12:05:36 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/freehdl/freehdl-20050510.ebuild,v 1.2 2005/08/30 12:44:04 phosphan Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ DEPEND="sys-devel/flex
 RDEPEND=">=dev-util/guile-1.2"
 SLOT="0"
 IUSE=""
-KEYWORDS="-x86 -ppc -*"
+KEYWORDS="~x86 ~ppc"
 
 src_unpack() {
 	if [ $(gcc-major-version) -le 3 -a $(gcc-minor-version) -le 4 ] \
@@ -23,6 +23,7 @@ src_unpack() {
 	fi
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-memory.patch
 	touch vaul/lexer.ll # rebuild the lexer, see bug #103157
 }