build fixes

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

5 files changed, 11 insertions, 27 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 260dcd06..2c50ade9 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,6 +1,5 @@
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
 AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
 AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
-EBUILD valgrind-9999.ebuild 2547 RMD160 0d971c5a81a19fd901044394b7293ec4c63dee87 SHA1 c8c38e1ac059a4bee42f0c3bb3ac9f400d3c7b92 SHA256 8694f474eb8f25410a7ba42499062132717d983fc87d0bda1112ac2418197082
+EBUILD valgrind-9999.ebuild 2454 RMD160 0c85ae56b9565c5ed9575b05428419b70a255969 SHA1 13eae1700cf6ac92e1f550bc1906ecc5c1f6f341 SHA256 16749943e7bf1f10b1f9d89da993e019718103da517eef227869549a7c5d203d
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
deleted file mode 100644
index 3233333c..00000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
---- valgrind-3.7.0.orig//configure.in	2011-11-05 07:13:30.000000000 -0400
-+++ valgrind-3.7.0/configure.in	2011-11-10 18:13:39.000000000 -0500
-@@ -109,7 +109,7 @@
-              | head -n 1 \
-              | $SED 's/i686-apple-darwin10//' \
-              | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index a451bb4f..c8d5684b 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -34,9 +34,6 @@ src_prepare() {
 	# warning about executable stacks.
 	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
 
-	# Fix the regex to get gcc's version
-	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
-
 	# Regenerate autotools files
 	eautoreconf
 }
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index e454005b..230d474e 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,2 +1,2 @@
-AUX libsoup-gnome-9999-system-lib.patch 6795 RMD160 493ca34ced82c798b4b323c5bce51bb3ed0d4cf5 SHA1 58d62469253e82d650d20822369eaead0e0dfa60 SHA256 76015b579cbb399af929c17ba0eb232310934c80a5a0326f58a8220fae0b0846
+AUX libsoup-gnome-9999-system-lib.patch 6819 RMD160 5b7c81031ba869716d7acbb6b786304c764cdd87 SHA1 161f4e67b6df6dcc438efa37fdc195864fadb36b SHA256 012aedd8606d62d2fab347d3e5d407fa9e1d998cae58b1ca7007a18b4090899e
 EBUILD libsoup-gnome-9999-r1.ebuild 1260 RMD160 b3992fd34fb1afebbda70d53de3ad014218ee821 SHA1 cd637dd029b5c538049708b1fdde381d1e5f8fe1 SHA256 7c174c9a6fdf1326464f7c6c1a277b298a240e7dec8e9ba4b2e3a7d0dab0f155
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
index b8b39c5a..66f79cf3 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
@@ -1,4 +1,4 @@
-From 4f4e9f3e2e54b485d6d1a43e5a94145a66289a9b Mon Sep 17 00:00:00 2001
+From 3abe0e9a7370324ffb7a4cf70dd068c492f0d502 Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Thu, 13 Oct 2011 12:03:04 +0200
 Subject: [PATCH] gentoo shit
@@ -11,12 +11,12 @@ Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  3 files changed, 76 insertions(+), 28 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 861daff..a6463fb 100644
+index bb94238..0562574 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,11 @@
  ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
 -SUBDIRS = libsoup tests docs
 +SUBDIRS = libsoup
@@ -41,25 +41,25 @@ index 861daff..a6463fb 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 443f300..2025eb6 100644
+index 899f7af..2a3e12c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,15 +72,30 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
--AM_PATH_GLIB_2_0(2.30.0,,,gobject gio)
+-AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 -if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
+-   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +PKG_PROG_PKG_CONFIG
 +enable_ssl=no
 +AC_ARG_WITH(libsoup-system,
 +   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
 +   [with_libsoup_system=$withval], [with_libsoup_system=no])
 +if test "$with_libsoup_system" = "no"; then
-+	AM_PATH_GLIB_2_0(2.30.0,,,gobject gio)
++	AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 +	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
++	   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 +
@@ -241,5 +241,5 @@ index 096f0fb..416e523 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8.rc0.dirty
+1.7.8.163.g9859a.dirty