2 files changed, 32 insertions, 16 deletions
diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in
index fea86b08b627..d35bf348b2d8 100644
--- a/devel/gobject-introspection/files/patch-Makefile.in
+++ b/devel/gobject-introspection/files/patch-Makefile.in
@@ -1,18 +1,16 @@
---- Makefile.in.orig	2010-12-24 00:50:07.000000000 +0100
-+++ Makefile.in	2010-12-24 00:51:39.000000000 +0100
-@@ -864,13 +864,13 @@
+--- Makefile.in.orig	2012-10-02 11:01:03.000000000 +0000
++++ Makefile.in	2012-10-02 11:02:59.000000000 +0000
+@@ -973,12 +973,11 @@
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
-+            -I$(GLIB_INCLUDEDIR)/.. \
              -DGETTEXT_PACKAGE=Dummy \
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_FILES = \
--                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+                $(GLIB_INCLUDEDIR)/glibconfig.h \
+-GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \
  	$(GLIB_INCLUDEDIR)/glib/*.h \
-                 gir/glib-2.0.c
- 
+ 	$(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \
+ 	$(am__append_4)
diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure
index 7fbbcde68d78..d2838d890f5e 100644
--- a/devel/gobject-introspection/files/patch-configure
+++ b/devel/gobject-introspection/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig	2011-05-02 17:19:45.000000000 -0500
-+++ configure	2011-05-02 17:19:58.000000000 -0500
-@@ -15983,7 +15983,7 @@
+--- configure.orig	2011-09-23 11:49:54.000000000 +0200
++++ configure	2011-09-23 11:50:31.000000000 +0200
+@@ -14400,10 +14400,10 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-if test "x$PYTHON_INCLUDES" == x; then
+-  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "x$PYTHON_INCLUDES" = x; then
++  PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   if test "$py_prefix" != "$py_exec_prefix"; then
+-    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++    PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   fi
  fi
+ 
+@@ -14429,10 +14429,10 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
+ $as_echo_n "checking for libraries required to link against libpython... " >&6; }
+-if test "x$PYTHON_LIBS" == x; then
++if test "x$PYTHON_LIBS" = x; then
+ 	PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ fi
+-if test "x$PYTHON_LIB_LOC" == x; then
++if test "x$PYTHON_LIB_LOC" = x; then
+ 	PYTHON_LIB_LOC="${py_prefix}/lib"
+ fi
+