Added gcc-4.3 patch, cleaning.

Package-Manager: portage-2.1.5_rc6

6 files changed, 50 insertions, 39 deletions

diff --git a/dev-cpp/muParser/ChangeLog b/dev-cpp/muParser/ChangeLog
index 5a1e4939494f..c435f91d0829 100644
--- a/dev-cpp/muParser/ChangeLog
+++ b/dev-cpp/muParser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/muParser
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.6 2008/03/15 10:05:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.7 2008/04/26 21:30:19 bicatali Exp $
+
+  26 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/muParser-1.28-gcc43.patch, metadata.xml, -muParser-1.25.ebuild,
+  muParser-1.28.ebuild:
+  Added gcc-4.3 patch, cleaning.
 
   15 Mar 2008; Markus Rothe <corsair@gentoo.org> muParser-1.28.ebuild:
   Added ~ppc64
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index ff272e2c66ce..04e7658ad03f 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX muParser-1.28-destdir.patch 799 RMD160 542672389ffd3d88abc7f1b9f7b0c159808e3c90 SHA1 c8ca147ac760522a03497adf0bbf570645a1b670 SHA256 250cf7042d6cc484dc5811571c79b0027f46deac07393d97951a4a0907fadc8b
-DIST muparser.tar.gz 207783 RMD160 7b010903114931634d70529e545d17d9c02d6f9c SHA1 67607d26cb85b03b61fbf889801db35c3008a2be SHA256 8d3ce8665de5b4634f584ac4c8f23f57aff03dabdd8d1cc76f9d528c4fd40d20
+AUX muParser-1.28-gcc43.patch 747 RMD160 e14dcb0d22e17a36c8c7c99104f7190a8a960834 SHA1 b9beddee8309a01c1e2de20848cbaa9992190679 SHA256 767ea424460f2c2e9fe33253f44655e47bfb5d8b32a606637bec8ec2302a773a
 DIST muparser_v128.tar.gz 623299 RMD160 140f4a3bb3e71caf29de93e067a11da65525cc26 SHA1 6c34bec84fc41c63bf796547d31f36537eb39a2a SHA256 4ff08e90dbfe492b495ac7d5b42d3fa10d744802aa12d95d3369dc8cc68a0c2f
-EBUILD muParser-1.25.ebuild 852 RMD160 709b198692ad068a9d727707c35c2a21c23d127f SHA1 17c13faa3cc60a3e9862bb8cc31ee6d709793b82 SHA256 c7df6a0b00d4f433d7baa67dda779f9064f230200c1a02c3dc3b001224c80e35
-EBUILD muParser-1.28.ebuild 1252 RMD160 245b96750172c12ca44a2cc29ebec41fe5e83555 SHA1 de2ba1a59741ec32930065f62889a7cdeb19ad20 SHA256 7010c2b4a702ef3b1f4beb33ee1919f8beb0d0e2500e1d87ea6609069c96a790
-MISC ChangeLog 1044 RMD160 b6cd130c9f3da40bc21775cb32200f7121992ea9 SHA1 845fdbd05adbadccd3836fc7d422bbd09eb3a88a SHA256 b58c4b53e686254539d1096601c3ce04e85d11c3dc68ff86dec84f6eb439273a
-MISC metadata.xml 259 RMD160 9efb7bb39324e85f4b2ec7be7193db99ca02f3d1 SHA1 bcbc498e343ee975365db7f3fca96b7bd350f70c SHA256 4afa04ef19c7207f0a584ad5da87721c23dbae83ad20bc65179cffffe5c80624
+EBUILD muParser-1.28.ebuild 1292 RMD160 ddf5209c82529324ef990893ed8361231dfae1b6 SHA1 a91565bbe3ab57f6dc926d0ba04dd23e46916fd0 SHA256 99a78aa6fbede7900550d3dac850834822fe9809b6a4fb7bddc1eb92aa509c6d
+MISC ChangeLog 1231 RMD160 54c32709fd3d9cc9c51234fc516755127c6dccfc SHA1 62abf8c5bccb44e1c1334fee9eaf6aa74be480d5 SHA256 91064a6072d29fc4226844b59d2126bd01589561f75e308f785cd05e30062b5e
+MISC metadata.xml 371 RMD160 cf1f5ffe20bac0026d986b4629f1db0b32e1bf77 SHA1 a3fb90c57b2c5ced1868d4be2d88d3af6bc773cd SHA256 75fe203bdedd4e649cf290eeaaa575116a85ef7303f7663a3876accf1de2c4ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIE5711ycZbhPLE2ARAma6AJ4rV5olFCjYxLt4WjsrYrasFhldswCdFumo
+1B2c0UeAhN08q2tI4Si2DTk=
+=xEtA
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/muParser/files/muParser-1.28-gcc43.patch b/dev-cpp/muParser/files/muParser-1.28-gcc43.patch
new file mode 100644
index 000000000000..1fd972978ba3
--- /dev/null
+++ b/dev-cpp/muParser/files/muParser-1.28-gcc43.patch
@@ -0,0 +1,25 @@
+--- include/muParserTest.h.orig
++++ include/muParserTest.h
+@@ -26,6 +26,7 @@
+ #ifndef MU_PARSER_TEST_H

+ #define MU_PARSER_TEST_H

+ 

++#include <cstdlib>
+ #include <string>

+ #include <numeric> // for accumulate

+ #include "muParser.h"

+@@ -87,12 +88,12 @@
+ 

+         static value_type Rnd(value_type v)

+         {

+-          return (value_type)(1+(v*std::rand()/(RAND_MAX+1.0)));

++          return (value_type)(1+(v*rand()/(RAND_MAX+1.0)));

+         }

+ 

+         static value_type RndWithString(const char_type*)

+         {

+-          return (value_type)( 1 + (1000.0f * std::rand() / (RAND_MAX + 1.0) ) );

++          return (value_type)( 1 + (1000.0f * rand() / (RAND_MAX + 1.0) ) );

+         }

+ 

+         static value_type Ping()

diff --git a/dev-cpp/muParser/metadata.xml b/dev-cpp/muParser/metadata.xml
index ef1907f15c5d..fc308ea1429f 100644
--- a/dev-cpp/muParser/metadata.xml
+++ b/dev-cpp/muParser/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-muParser is a C++ based mathematical expression parser
+  muParser is a C++ library for mathematical expression parsing.
+  It is based on transforming an expression into a bytecode and
+  precalculating constant parts of it.
 </longdescription>
 </pkgmetadata>
-
diff --git a/dev-cpp/muParser/muParser-1.25.ebuild b/dev-cpp/muParser/muParser-1.25.ebuild
deleted file mode 100644
index f0f183cf742c..000000000000
--- a/dev-cpp/muParser/muParser-1.25.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.25.ebuild,v 1.5 2006/11/17 16:40:30 swegener Exp $
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="http://muparser.sourceforge.net/"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86"
-IUSE="doc"
-MY_PN="${PN/P/p}"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}.tar.gz"
-DEPEND="doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	econf --disable-samples || die "econf failed"
-	emake -j1 CXXFLAGS="${CXXFLAGS}" || die "emake failed"
-	if use doc; then
-		make documentation || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	if use doc; then
-		insinto "/usr/share/doc/${PF}"
-		doins -r docs/html
-	fi
-}
diff --git a/dev-cpp/muParser/muParser-1.28.ebuild b/dev-cpp/muParser/muParser-1.28.ebuild
index 7f14636b394f..d7f0328980ae 100644
--- a/dev-cpp/muParser/muParser-1.28.ebuild
+++ b/dev-cpp/muParser/muParser-1.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.28.ebuild,v 1.2 2008/03/15 10:05:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.28.ebuild,v 1.3 2008/04/26 21:30:19 bicatali Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	cd "${S}"
 	# fix destdir to install pkgconfig file
 	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {