Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 devel/valgrind/DETAILS                         |    4 +-
 devel/valgrind/HISTORY                         |    5 ++
 devel/valgrind/PRE_BUILD                       |    8 ----
 devel/valgrind/glibc-version.patch             |   49 
+++++++++++++++++++++++++
 devel/valgrind/valgrind-3.5.0-glibc-2.11.patch |   43 ---------------------
 5 files changed, 57 insertions(+), 52 deletions(-)

New commits:
commit 8bc746ddb378a2b76b09c4ff2dd4e4c251a15a71
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    valgrind: => 3.6.0

diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index d207c4b..04b0b58 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -13,8 +13,8 @@ then
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
 else
-         VERSION=3.5.0
-     
SOURCE_HASH=sha512:fd2db7f422e3f52da0a672d895c5f3f2afd84b73d644b54ab67e6e96dcf024997ef6afec67f633dbd897e04b6b28b83f12d60fcea0ca999721e09a7dc88cc59b
+         VERSION=3.6.0
+     
SOURCE_HASH=sha512:be000c25be7b2a009fdd9959fea00f16716e41323d66aed50ac3e1b8c61ecf11104a8da28892089710fffc264fd9e780278ddf6225852d11b99392f9eb5dd21d
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 53f67cb..4981317 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,8 @@
+2010-11-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.6.0
+       * glibc-version.patch: added
+       * valgrind-3.5.0-glibc-2.11.patch: removed, replaced by universal 
patch
+
 2010-03-29 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD: Fix version detection for glibc 2.11 (not 2.11.1). 
 
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 7ff8e0a..a921a98 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -6,10 +6,4 @@ then
   NOCONFIGURE=Y  ./autogen.sh
 fi &&
 
-# Patch to compile with glibc version 2.11
-# By Maurice van der Pot <griffon26 AT gentoo.org> from gentoo
-GLIBC_VER=$(installed_version glibc) &&
-if [[ $GLIBC_VER == 2.11 ]] || [[ ${GLIBC_VER%.*} == 2.11 ]]; then
-  patch -p0 < ${SCRIPT_DIRECTORY}/valgrind-3.5.0-glibc-2.11.patch &&
-  autoreconf
-fi
+patch -p0 < "$SPELL_DIRECTORY/glibc-version.patch"
diff --git a/devel/valgrind/glibc-version.patch 
b/devel/valgrind/glibc-version.patch
new file mode 100644
index 0000000..53c0759
--- /dev/null
+++ b/devel/valgrind/glibc-version.patch
@@ -0,0 +1,49 @@
+--- glibc-2.X.supp.in.orig
++++ glibc-2.X.supp.in
+@@ -168,9 +168,9 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:__sendto_nocancel
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+    fun:__nscd_get_map_ref
+    fun:nscd_get*_r
+    fun:*nscd*
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ 
+@@ -199,18 +199,18 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    X11-64bit-padding-4b
+    Memcheck:Param
+    socketcall.send(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ ##----------------------------------------------------------------------##
diff --git a/devel/valgrind/valgrind-3.5.0-glibc-2.11.patch 
b/devel/valgrind/valgrind-3.5.0-glibc-2.11.patch
deleted file mode 100644
index a2a0c12..0000000
--- a/devel/valgrind/valgrind-3.5.0-glibc-2.11.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ruN configure.in configure.in
---- configure.in       2009-11-07 23:34:37.000000000 +0100
-+++ configure.in       2009-11-07 23:38:14.000000000 +0100
-@@ -656,6 +656,16 @@
- ],
- GLIBC_VERSION="2.10")
- 
-+AC_EGREP_CPP([GLIBC_211], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.11")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || 
defined(_AIXVERSION_530)
-@@ -742,6 +752,13 @@
-       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-       ;;
-+     2.11)
-+      AC_MSG_RESULT(2.11 family)
-+      AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x])
-+      DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+      DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+      DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+      ;;
-      aix5)
-       AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
-       AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 
or 5.3])
-@@ -755,7 +772,7 @@
- 
-      *)
-       AC_MSG_RESULT(unsupported version)
--      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
-       AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
-       AC_MSG_ERROR([or Darwin libc])
-       ;;