Added new valgrind releases 2.4.1 and 3.0.0

(Portage version: 2.0.51.22-r1)

9 files changed, 325 insertions, 15 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index ffb5751b02a4..9f2bbbfc9383 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.49 2005/06/28 20:34:57 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.50 2005/08/04 21:38:19 griffon26 Exp $
+
+*valgrind-3.0.0 (04 Aug 2005)
+*valgrind-2.4.1 (04 Aug 2005)
+
+  04 Aug 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-2.4.1-dont-trample-cflags.patch,
+  +files/valgrind-2.4.1-static-const.patch,
+  +files/valgrind-3.0.0-pie-fix.patch, +valgrind-2.4.1.ebuild,
+  +valgrind-3.0.0.ebuild:
+  Added two new releases of valgrind. 2.4.1 is mainly a stability release 
+  while 3.0.0 is a release that is much more portable to platforms other 
+  than x86. It should work on amd64 already.
+  I also reevaluated all patches/restrictions that were present in earlier
+  ebuilds, removed the ones that seem no longer necessary and commented 
+  the ones that do.
 
   28 Jun 2005; Maurice van der Pot <griffon26@gentoo.org>
   -files/valgrind-2.1.1-pic.patch,
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index f3427f45989f..21db44e9c7f5 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
-MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407
-MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
 MD5 0ab719f9f994394bbf150f4c8837fe73 ChangeLog 4496
+MD5 57fabb8b27eaa634c63e8b619eb8e1eb valgrind-3.0.0.ebuild 1685
+MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
+MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407
+MD5 277afed15b8661a3d38ff455c4222f2e valgrind-2.4.1.ebuild 1878
 MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
-MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
+MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
 MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
 MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140
-MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC5rppgIKl8Uu19MoRAkzuAJ0VPF+LmQNYOqvKH3o+quSHMTsq8wCeLVqC
-BAF1K7AGvSH4lVZobczpEcs=
-=Hs1+
------END PGP SIGNATURE-----
+MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
+MD5 af6b49666df28ad2a40f2f644fefce83 files/digest-valgrind-3.0.0 68
+MD5 a5dde62cbb4bb255219643b61493b950 files/digest-valgrind-2.4.1 68
+MD5 c67ef295757f9c8b4e9be146f6c4f873 files/valgrind-2.4.1-dont-trample-cflags.patch 442
+MD5 d177de2c2f79d24d4ad74644ee49f667 files/valgrind-2.4.1-static-const.patch 4397
+MD5 24971d28d91da6c61168fa217d10b47b files/valgrind-3.0.0-pie-fix.patch 864
diff --git a/dev-util/valgrind/files/digest-valgrind-2.4.1 b/dev-util/valgrind/files/digest-valgrind-2.4.1
new file mode 100644
index 000000000000..66fcf4f52b5e
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-2.4.1
@@ -0,0 +1 @@
+MD5 8ada0f37ddd940032b85ea859fedb037 valgrind-2.4.1.tar.bz2 1078229
diff --git a/dev-util/valgrind/files/digest-valgrind-3.0.0 b/dev-util/valgrind/files/digest-valgrind-3.0.0
new file mode 100644
index 000000000000..617bd30a1217
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-3.0.0
@@ -0,0 +1 @@
+MD5 e976a343c61d9505162f595a8aeb09c1 valgrind-3.0.0.tar.bz2 2679021
diff --git a/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch b/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch
new file mode 100644
index 000000000000..452a45e08f4f
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-2.4.1-dont-trample-cflags.patch
@@ -0,0 +1,19 @@
+diff -ruN valgrind-2.4.1/configure valgrind-2.4.1-fixed/configure
+--- valgrind-2.4.1/configure	2005-08-03 22:12:16.789460240 +0200
++++ valgrind-2.4.1-fixed/configure	2005-08-03 22:14:38.055984464 +0200
+@@ -4735,6 +4735,7 @@
+ if test "$handles_mmmx" = "yes"; then
+   USE_MMX_REGISTER="-mmmx"
+ fi
++CFLAGS=$safe_CFLAGS
+ 
+ 
+ 
+@@ -4804,6 +4805,7 @@
+ if test "$handles_msse" = "yes"; then
+   USE_SSE_REGISTER="-msse"
+ fi
++CFLAGS=$safe_CFLAGS
+ 
+ 
+ 
diff --git a/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch b/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch
new file mode 100644
index 000000000000..8d13a4f7e8b4
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-2.4.1-static-const.patch
@@ -0,0 +1,132 @@
+diff -ruN valgrind-2.4.1/coregrind/vg_memory.c valgrind-2.4.1-fixed/coregrind/vg_memory.c
+--- valgrind-2.4.1/coregrind/vg_memory.c	2005-07-19 21:13:46.000000000 +0200
++++ valgrind-2.4.1-fixed/coregrind/vg_memory.c	2005-08-03 23:02:13.570880216 +0200
+@@ -158,7 +158,7 @@
+ {
+    Segment *s;
+    Segment *next;
+-   static const Bool debug = False || mem_debug;
++   const Bool debug = False || mem_debug;
+    Addr end;
+ 
+    if (len == 0)
+@@ -324,7 +324,7 @@
+ 			   UInt dev, UInt ino, ULong off, const Char *filename)
+ {
+    Segment *s;
+-   static const Bool debug = False || mem_debug;
++   const Bool debug = False || mem_debug;
+    Bool recycled;
+ 
+    if (debug)
+@@ -479,7 +479,7 @@
+ void VG_(mprotect_range)(Addr a, SizeT len, UInt prot)
+ {
+    Segment *s, *next;
+-   static const Bool debug = False || mem_debug;
++   const Bool debug = False || mem_debug;
+    Segment *s1, *s2;
+ 
+    if (debug)
+@@ -524,7 +524,7 @@
+ 
+ Addr VG_(find_map_space)(Addr addr, SizeT len, Bool for_client)
+ {
+-   static const Bool debug = False || mem_debug;
++   const Bool debug = False || mem_debug;
+    Segment *s;
+    Addr ret;
+    Addr limit = (for_client ? VG_(client_end)-1   : VG_(valgrind_last));
+diff -ruN valgrind-2.4.1/coregrind/vg_stabs.c valgrind-2.4.1-fixed/coregrind/vg_stabs.c
+--- valgrind-2.4.1/coregrind/vg_stabs.c	2005-07-27 14:37:52.000000000 +0200
++++ valgrind-2.4.1-fixed/coregrind/vg_stabs.c	2005-08-03 23:03:07.065747760 +0200
+@@ -123,7 +123,7 @@
+ */
+ static SymType *structRef(StabTypeTab *tab, SymType *def, Bool isstruct, Char *name)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    struct structlist *sl;
+    SymType *ty;
+    static Int warnlen = 0;
+@@ -168,7 +168,7 @@
+ /* Add a structural defintion for a struct/union reference */
+ static SymType *structDef(StabTypeTab *tab, SymType *def, Bool isstruct, Char *name)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    SymType *ref = structRef(tab, NULL, isstruct, name);
+ 
+    /* it seems that GNAT likes to declare names as both struct tags
+@@ -236,7 +236,7 @@
+ /* add a new index for a file */
+ static void addFileAlias(StabTypeTab *tab, Char *filename, UInt instance, Int idx)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    struct header *hp;
+ 
+    for(hp = tab->headerhash[header_hash(filename, instance)]; hp != NULL; hp = hp->next) {
+@@ -255,7 +255,7 @@
+ 
+ static void addHeader(StabTypeTab *tab, Char *filename, UInt instance, Int idx)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    struct header *hp, **bucket;
+    
+    if (debug)
+@@ -476,7 +476,7 @@
+ 
+ static void stab_resolve(SymType *st, void *data)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    Char *str = (Char *)data;
+    vg_assert(!VG_(st_isresolved)(st));
+ 
+@@ -493,7 +493,7 @@
+    introduced anywhere, so we need to scan it all to pick them up. */
+ static SymType *stabtype_parser(SegInfo *si, SymType *def, Char **pp)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    Char *p = *pp;
+    Char t;
+    SymType *type;
+@@ -1018,7 +1018,7 @@
+ /* parse a symbol reference: NAME ':' DESC TYPE */
+ static Bool initSym(SegInfo *si, Sym *sym, stab_types kind, Char **namep, Int val)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    Char *name = *namep;
+    Char *ty;
+    Int len;
+@@ -1159,7 +1159,7 @@
+    definitions helps a lot. */
+ static Scope *addSymsToScope(Scope *sc, struct symlist *list, Int nsyms, Scope *outer)
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    Int j;
+    struct symlist *n;
+    Int base;
+@@ -1205,7 +1205,7 @@
+ 				 UChar* stabC,   Int stab_sz, 
+ 				 UChar* stabstr, Int stabstr_sz )
+ {
+-   static const Bool debug = False || stabs_debug;
++   const Bool debug = False || stabs_debug;
+    Int    i;
+    Int    n_stab_entries;
+    struct nlist* stab = (struct nlist*)stabC;
+@@ -1283,7 +1283,7 @@
+ 
+       /* handle continued string stabs */
+       {
+-	 static const Bool contdebug = False || stabs_debug;
++	 const Bool contdebug = False || stabs_debug;
+ 	 Int buflen = 0;
+ 	 Int idx = 0;
+ 	 Char *buf = NULL;
diff --git a/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch b/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch
new file mode 100644
index 000000000000..8919eeb2506a
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.0.0-pie-fix.patch
@@ -0,0 +1,24 @@
+diff -ruN valgrind-3.0.0/none/tests/x86/Makefile.in valgrind-3.0.0-fixed/none/tests/x86/Makefile.in
+--- valgrind-3.0.0/none/tests/x86/Makefile.in	2005-08-03 22:43:14.000000000 +0200
++++ valgrind-3.0.0-fixed/none/tests/x86/Makefile.in	2005-08-04 22:52:05.563599512 +0200
+@@ -151,7 +151,7 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fno-pie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+diff -ruN valgrind-3.0.0/tests/Makefile.in valgrind-3.0.0-fixed/tests/Makefile.in
+--- valgrind-3.0.0/tests/Makefile.in	2005-08-03 22:43:14.000000000 +0200
++++ valgrind-3.0.0-fixed/tests/Makefile.in	2005-08-04 22:52:15.937022512 +0200
+@@ -93,7 +93,7 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fno-pie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
diff --git a/dev-util/valgrind/valgrind-2.4.1.ebuild b/dev-util/valgrind/valgrind-2.4.1.ebuild
new file mode 100644
index 000000000000..7b768973a38a
--- /dev/null
+++ b/dev-util/valgrind/valgrind-2.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.4.1.ebuild,v 1.1 2005/08/04 21:38:19 griffon26 Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An open-source memory debugger for x86-GNU/Linux and ppc-GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="X"
+
+# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
+#RESTRICT="strip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# make sure our CFLAGS are respected
+	einfo "Changing configure to respect CFLAGS"
+	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
+
+	# Enables valgrind to build with PIE and disables PIE for 
+	# tests that fail to build with it
+	epatch "${FILESDIR}/valgrind-2.4.0-pie-fix.patch"
+
+	epatch "${FILESDIR}/${P}-dont-trample-cflags.patch"
+	epatch "${FILESDIR}/${P}-static-const.patch"
+}
+
+src_compile() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression" 
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     ???
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	#filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	# Optionally build in X suppression files
+	use X && myconf="--with-x" || myconf="--with-x=no"
+
+	# Enable this, otherwise when built with PIE it exits at startup
+	# with: "executable range is outside acceptable range"
+	myconf="${myconf} --enable-pie"
+
+	econf ${myconf} || die "Configure failed!"
+	emake || die "Make failed!"
+}
+
+src_install() {
+	einstall docdir="${D}/usr/share/doc/${PF}/html" || die
+	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README* TODO
+}
+
diff --git a/dev-util/valgrind/valgrind-3.0.0.ebuild b/dev-util/valgrind/valgrind-3.0.0.ebuild
new file mode 100644
index 000000000000..1591d7aec420
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.0.0.ebuild,v 1.1 2005/08/04 21:38:19 griffon26 Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X"
+
+# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
+#RESTRICT="strip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# make sure our CFLAGS are respected
+	einfo "Changing configure to respect CFLAGS"
+	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
+
+	# Disables PIE for tests that fail to build with it
+	epatch "${FILESDIR}/${P}-pie-fix.patch"
+}
+
+src_compile() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression" 
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     ???
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	#filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	# Optionally build in X suppression files
+	use X && myconf="--with-x" || myconf="--with-x=no"
+
+	# Enable this, otherwise when built with PIE it exits at startup
+	# with: "executable range is outside acceptable range"
+	myconf="${myconf} --enable-pie"
+
+	econf ${myconf} || die "Configure failed!"
+	emake || die "Make failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
+}
+