Added bugfix release 3.1.1 of valgrind (as requested in bug #127766)

(Portage version: 2.1_pre3-r1)

4 files changed, 79 insertions, 11 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index c7ab28b6f224..daf5a66d02da 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.57 2006/03/07 18:38:19 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.58 2006/03/30 15:51:01 griffon26 Exp $
+
+*valgrind-3.1.1 (29 Mar 2006)
+
+  29 Mar 2006; Maurice van der Pot <griffon26@gentoo.org>
+  +valgrind-3.1.1.ebuild:
+  Added version 3.1.1 of valgrind, which is purely a bug fixing release.
+  Requested by Nuno Lopes <nunoplopes@sapo.pt> in bug #127766.
 
   07 Mar 2006; Maurice van der Pot <griffon26@gentoo.org>
   +files/valgrind-3.1.0-amd64-nomultilib-fix.patch, valgrind-3.1.0.ebuild:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 2db4583b8209..c5be911b16d2 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c08e1561575e5b97afda56e5dc29abeb ChangeLog 7064
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
 MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140
@@ -9,6 +6,7 @@ MD5 af6b49666df28ad2a40f2f644fefce83 files/digest-valgrind-3.0.0 68
 MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1 68
 MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1-r1 68
 MD5 d2a70491913b3d5db35a7ea10fa50b71 files/digest-valgrind-3.1.0 68
+MD5 bcc96896f598c7ebd3ca8b23a585ac61 files/digest-valgrind-3.1.1 68
 MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
 MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
 MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
@@ -26,10 +24,4 @@ MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799
 MD5 c824aeed84391f896caea42dc444afc6 valgrind-3.0.1-r1.ebuild 1887
 MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690
 MD5 35c90975bda820631eb617e6b33038af valgrind-3.1.0.ebuild 2354
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEDdMoMGnpIbeahxwRAkA1AJ9nrDUqwME1gHrUVgA9zocEPtXbDwCfcMBt
-EsljCqvMIvtYeSadbv9Y0hc=
-=pnjv
------END PGP SIGNATURE-----
+MD5 35c90975bda820631eb617e6b33038af valgrind-3.1.1.ebuild 2354
diff --git a/dev-util/valgrind/files/digest-valgrind-3.1.1 b/dev-util/valgrind/files/digest-valgrind-3.1.1
new file mode 100644
index 000000000000..c46672d777a2
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-3.1.1
@@ -0,0 +1 @@
+MD5 3bbfafedb59c19bf75977381ce2eb6d7 valgrind-3.1.1.tar.bz2 3074066
diff --git a/dev-util/valgrind/valgrind-3.1.1.ebuild b/dev-util/valgrind/valgrind-3.1.1.ebuild
new file mode 100644
index 000000000000..c5232bb31103
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.1.1.ebuild,v 1.1 2006/03/30 15:51:01 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="-* ~amd64 ~ppc ~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.in to respect CFLAGS"
+	sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+
+	# undefined references to __guard and __stack_smash_handler in VEX (bug #114347)
+	einfo "Changing Makefile.flags.am to disable SSP"
+	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.flags.am
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.am
+
+	einfo "Regenerating autotools files..."
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+
+	# fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407)
+	use amd64 && (has_multilib_profile || epatch "${FILESDIR}/valgrind-3.1.0-amd64-nomultilib-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
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler 
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	# Optionally build in X suppression files
+	use X && myconf="--with-x" || myconf="--with-x=no"
+
+	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*
+}
+