Added a configure.in patch for 2.6

4 files changed, 29 insertions, 4 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 2e766877ea7c..c003390207e7 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.13 2003/08/09 15:27:53 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.14 2003/08/15 16:25:09 solar Exp $
+
+  15 Aug 2003; <solar@gentoo.org> valgrind-2.0_pre20030725.ebuild:
+  Added a configure.in patch for 2.6
 
 *valgrind-2.0_pre20030725 (09 Aug 2003)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3d5d4dffd289..c0b23dc164c2 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,10 +1,10 @@
-MD5 36669a962a62bc0564e47edead11d8a9 ChangeLog 1964
+MD5 7552056a8b8d5bdb6cf8feb7e332c238 ChangeLog 1964
 MD5 973afeeeb047476d548ea58bed28be01 valgrind-1.0.4-r1.ebuild 1028
 MD5 b4cd02697ff4ae27f4209e4b97efbef5 valgrind-1.0.4.ebuild 848
 MD5 f5ef8ff397b4d02703886d4f72a38cec valgrind-1.9.3.ebuild 849
 MD5 cd1613c1ff225b323035e9d05913379d valgrind-1.9.6.ebuild 831
 MD5 1a60e28da10ec3a895b799a2ed22e344 metadata.xml 1019
-MD5 e8e732181a0cacd0589b5daa2d83d233 valgrind-2.0_pre20030725.ebuild 1130
+MD5 516616357b548f0b68b568e5a176bd64 valgrind-2.0_pre20030725.ebuild 1130
 MD5 824cef2ebde486eaf99304942ea0c359 files/digest-valgrind-1.0.4 152
 MD5 e352ba09353c1e5ac64df40cacba5a22 files/digest-valgrind-1.0.4-r1 139
 MD5 999f7f389aacb30a3fe81c3975a6a963 files/digest-valgrind-1.9.3 67
diff --git a/dev-util/valgrind/files/valgrind-configure.in-2.6.diff b/dev-util/valgrind/files/valgrind-configure.in-2.6.diff
new file mode 100644
index 000000000000..8af4f022b7d6
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-configure.in-2.6.diff
@@ -0,0 +1,11 @@
+--- configure.in.orig	2003-08-15 11:11:58.083530432 -0500
++++ configure.in	2003-08-15 11:11:24.500635808 -0500
+@@ -97,7 +97,7 @@
+ kernel=`uname -r`
+ 
+ case "${kernel}" in
+-     2.5.*) 
++     2.5.*|2.6.*) 
+ 	    AC_MSG_RESULT([2.5 family (${kernel})])
+ 	    AC_DEFINE([KERNEL_2_5], 1, [Define to 1 if you're using Linux 2.5.x])
+ 	    ;;
diff --git a/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild b/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild
index f282e0c4211a..11f238932f4d 100644
--- a/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild
+++ b/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild,v 1.1 2003/08/09 15:27:53 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.0_pre20030725.ebuild,v 1.2 2003/08/15 16:25:09 solar Exp $
 
 IUSE="X"
 
@@ -11,11 +11,22 @@ DESCRIPTION="An open-source memory debugger for x86-GNU/Linux"
 HOMEPAGE="http://developer.kde.org/~sewardj"
 SRC_URI="http://developer.kde.org/~sewardj/${MY_P}.tar.bz2"
 DEPEND="virtual/glibc
+	sys-devel/autoconf
 	X? ( virtual/x11 )"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 -sparc -ppc -alpha"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if [ `uname -r | awk -F . '{print $2}'` == 6 ]; then
+		epatch ${FILESDIR}/${PN}-configure.in-2.6.diff
+		autoconf || die "error while running autoconf"
+	fi
+}
+
 src_compile() {
 	local myconf
 	use X && myconf="--with-x" || myconf="--with-x=no"