New version

5 files changed, 74 insertions, 7 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index dd896882704d..2a20624b4a2c 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.31 2004/07/10 17:23:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.32 2004/07/21 22:52:31 lu_zero Exp $
+
+*valgrind-2.1.2 (22 Jul 2004)
+
+  22 Jul 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/valgrind-2.1.2-kernel-headers.patch, +valgrind-2.1.2.ebuild:
+  New version, thanks to Olaf Freyer <aaron@cs.tu-berlin.de> for the 
+  early patch.
 
   10 Jul 2004; Tom Martin <slarti@gentoo.org> valgrind-2.1.1-r1.ebuild:
   Marking -amd64, valgrind is ix86 specific.
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 39083acec490..c2b1a57a0a93 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,12 +1,15 @@
 MD5 87ba65472b071a1a696226f0e36937d5 valgrind-2.0.0.ebuild 1173
+MD5 2b26725a9bb979f4362d35b5d1d8c057 valgrind-2.1.2.ebuild 998
+MD5 f5f1d47f96395d391da719083739717b ChangeLog 937
+MD5 f4b910c589410d7ec055b9bda08a32b1 metadata.xml 1001
 MD5 36b52cc7f792a5f6944af5e3488fc3cd valgrind-2.1.1-r1.ebuild 1140
-MD5 f07a6833b689f5e27ddc6f11cce48fbb valgrind-2.1.0.ebuild 1018
-MD5 2f098837f2402fb6aa6cea41fd2d81fe ChangeLog 700
 MD5 a0b171b6dab7cb44a9eab9bf70738b7c valgrind-2.1.1.ebuild 926
-MD5 f4b910c589410d7ec055b9bda08a32b1 metadata.xml 1001
+MD5 f07a6833b689f5e27ddc6f11cce48fbb valgrind-2.1.0.ebuild 1018
+MD5 1ba26123d6543d9b4faa808595fbb5b8 files/valgrind-2.1.1-pic.patch 8338
+MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1-r1 67
 MD5 95845f5c26fd00027163547288c17e54 files/valgrind-configure.in-2.6.diff 336
-MD5 286d10f4514e8a85360ce6ba5654ae93 files/digest-valgrind-2.0.0 67
 MD5 a69fe5652a8ca5fb1d04521fe0c56850 files/digest-valgrind-2.1.0 138
+MD5 dd98566219aee764f036fae263b1ce61 files/digest-valgrind-2.1.2 67
+MD5 286d10f4514e8a85360ce6ba5654ae93 files/digest-valgrind-2.0.0 67
+MD5 96f4ea73f94e4b969cd764574aeef978 files/valgrind-2.1.2-kernel-headers.patch 826
 MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1 67
-MD5 1ba26123d6543d9b4faa808595fbb5b8 files/valgrind-2.1.1-pic.patch 8338
-MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1-r1 67
diff --git a/dev-util/valgrind/files/digest-valgrind-2.1.2 b/dev-util/valgrind/files/digest-valgrind-2.1.2
new file mode 100644
index 000000000000..d39fcf1d45f4
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-2.1.2
@@ -0,0 +1 @@
+MD5 585e3ac5f7b86d6cd3e2bed07af732de valgrind-2.1.2.tar.bz2 962025
diff --git a/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch b/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch
new file mode 100644
index 000000000000..4fe8c3ff99ce
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-2.1.2-kernel-headers.patch
@@ -0,0 +1,17 @@
+diff -ruN valgrind-2.1.2.orig/coregrind/vg_unsafe.h valgrind-2.1.2/coregrind/vg_unsafe.h
+--- valgrind-2.1.2.orig/coregrind/vg_unsafe.h	2004-07-21 23:44:53.146503216 +0200
++++ valgrind-2.1.2/coregrind/vg_unsafe.h	2004-07-21 23:48:04.156465288 +0200
+@@ -47,11 +47,12 @@
+ #include <sys/socket.h>   /* for struct msghdr */
+ #include <linux/sockios.h>/* for SIOCOUTQ */
+ #include <sys/un.h>       /* for sockaddr_un */
+-#include <net/if.h>       /* for struct ifreq et al */
+ #include <net/if_arp.h>   /* for struct arpreq */
+ #include <net/route.h>    /* for struct rtentry */
+ #ifdef KERNEL_2_6
+ #include <linux/compiler.h> /* for __user definition */
++#else
++#include <net/if.h>       /* for struct ifreq et al */
+ #endif
+ #include <asm/ipc.h>      /* for struct ipc_kludge */
+ #include <linux/msg.h>    /* for struct msgbuf */
diff --git a/dev-util/valgrind/valgrind-2.1.2.ebuild b/dev-util/valgrind/valgrind-2.1.2.ebuild
new file mode 100644
index 000000000000..b81a38b9153f
--- /dev/null
+++ b/dev-util/valgrind/valgrind-2.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.2.ebuild,v 1.1 2004/07/21 22:52:31 lu_zero Exp $
+
+inherit flag-o-matic eutils
+RESTRICT="nostrip"
+
+DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
+HOMEPAGE="http://valgrind.kde.org"
+SRC_URI="http://developer.kde.org/~sewardj/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -sparc -ppc -alpha"
+IUSE="X"
+
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	X? ( virtual/x11 )"
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-kernel-headers.patch
+}
+src_compile() {
+	local myconf
+
+	filter-flags -fPIC
+
+	use X && myconf="--with-x" || myconf="--with-x=no"
+	# note: it does not appear safe to play with CFLAGS
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall docdir="${D}/usr/share/doc/${PF}" || die
+	dodoc ACKNOWLEDGEMENTS AUTHORS INSTALL NEWS \
+		PATCHES_APPLIED README* TODO ChangeLog FAQ.txt
+}