[dev-libs/libindicate] Add more patches from launchpad, fix build for python != 2.6

(Portage version: 2.2.0_alpha6/git/Linux x86_64, unsigned Manifest commit)

6 files changed, 164 insertions, 101 deletions

diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 8d286b3b0bc..c21c41f66a4 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,9 +1,12 @@
-AUX libindicate-0.4.4-fix-aclocal.patch 3871 RMD160 7ad6fddf5ea0489b7399524591892c1ec1fc1ff3 SHA1 24e8e89e4c066f91fcbe309ccf64f6a204f40318 SHA256 b6957d212add95e04b0bb4ba11dfe27be63bbf5b0b6183d378450ca9deed9502
+AUX libindicate-0.4.4-fix-aclocal.patch 181 RMD160 81fbc27796faba28141e2efdd8aefd402c6f3f92 SHA1 afef17326571a4c17404690e06110e611b0e3f1c SHA256 7d34560b93dc25b1bfb89aa9ea726bd9f70cd3107eb21e0692aaa29c9b369c96
+AUX libindicate-0.4.4-fix-introspection.patch 3690 RMD160 d64ff2fb723ba13fc7418e9c63889aff0759b85c SHA1 f623a0929190da9caef0e0b569c96ca50c12daba SHA256 678176349d2121cc4d2fc0846f8b0609af1615beb6fac01717e6f01ddef10e8d
 AUX libindicate-0.4.4-fix-out-of-source-build.patch 1322 RMD160 f27759c12ce602a39005613878ea37383f63cf74 SHA1 9cc7758aa0dd627e4f5db935a2b0a0db192ec793 SHA256 7be0fa28278cc69bee72f545667ecbf966f0d36ed5db2b5dc6e5d048a484710d
+AUX libindicate-0.4.4-fix-python-version.patch 757 RMD160 42c78617d4388482f05e2240d98fd07db752e58d SHA1 5f588f1f550b06e636e28674b75616c43b1a8392 SHA256 27b3ac6e71549e8c27817e80e14c0e3e217fc83afd8fa9b3c5cbcd5b9ede498d
 AUX libindicate-0.4.4-optional-doc.patch 759 RMD160 7fb4232b2e0933daa7258c3995232a470cb26b4a SHA1 fcd017e0a68d05222e67f0319b2f56a36bc9a72c SHA256 a1be4b5e26a200442a471c10fd3513c5d83d9a93b647e2a2ea5ec5947bf2ec99
 AUX libindicate-0.4.4-optional-examples.patch 310 RMD160 08c649cbafbc742562179e09d2ecb3a52f790144 SHA1 908d5812dbaee1fd7f9a03e60864815af7d84e0f SHA256 cdb14c7848ef1b4cb828a2e865d7945116b21ad6890bd41b7da5320ff3994a63
+AUX libindicate-0.4.4-optional-gtk.patch 1270 RMD160 97b50ab6cf8c94d18fdf77e863a5333098f5feb8 SHA1 14c7ad1088b18b40ce966712b57e675dc2a1c14e SHA256 ac779b3954a48afc4a11cb41e9f4df65f852111c6434544affacc650d527b60f
 AUX libindicate-0.4.4-optional-mono-example.patch 321 RMD160 70cdade62938796b70a6c7a0696b6976b8f8d93c SHA1 7481c1a7a0d478f638eefdc79d05331581321406 SHA256 dc68fd7ba8f03618f2f6f369652ba7a6f72b921190e751667afcbf70be393f5f
 DIST libindicate-0.4.4.tar.gz 473110 RMD160 2e926172d8b0a2604f44b2b42ee70f3a1fc837f9 SHA1 0dc3ad4c35581adea9d9ae89daacf820c764f24a SHA256 20d7ac6fe02b28283c619fe583d5b0fb8a473bb17ef020c2fa40c53f72e315ce
-EBUILD libindicate-0.4.4.ebuild 2291 RMD160 e885d0f5213394c7561f75d0db414e28dc8b1cf4 SHA1 2a73ea0c04281e17b9e699ed15d1a52a5e3bf147 SHA256 176a12a03fd34490d5675fee357ce15c93c1ee8e245a925d0be2bebe6943fd44
+EBUILD libindicate-0.4.4.ebuild 2641 RMD160 8f70d56b716d63d6b2aa0d2dd8bf02e2607afada SHA1 7049aabf16b8399281c915f73f7d80450a1fd44b SHA256 ce683b86c31d25aa7c52f3fcc811f8ea7c11854efb32cae98a185ff0b9d4f05c
 MISC ChangeLog 2020 RMD160 e9cf67135150b1d8de640c3b050c2b1a01b1be81 SHA1 5d30d4279ffaa1fb2375efbf40df9371f6433d3e SHA256 40810bb233137b0efcf1d7b6a4fecef7230795df68136013b30fd5d4ae67d182
 MISC metadata.xml 258 RMD160 69b53b6c07c87d5673ee16de06750f3aceed35e8 SHA1 649b8b012b03f82fe418ff135f90f7e21bcc4263 SHA256 5603025b3bd04b6daa8f57cba6ad6eea690cf08beff6c011c38d35acafb3a2d9
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
index 65d63efe30d..d7184a39ec3 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
@@ -5,100 +5,3 @@
  
  SUBDIRS = \
  	libindicate \
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ m4//introspection.m4	2010-09-20 23:33:07.134254070 +0200
-@@ -0,0 +1,94 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+    dnl enable/disable introspection
-+    m4_if([$2], [require],
-+    [dnl
-+        enable_introspection=yes
-+    ],[dnl
-+        AC_ARG_ENABLE(introspection,
-+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+                                 [Enable introspection for this build]),, 
-+                                 [enable_introspection=auto])
-+    ])dnl
-+
-+    AC_MSG_CHECKING([for gobject-introspection])
-+
-+    dnl presence/version checking
-+    AS_CASE([$enable_introspection],
-+    [no], [dnl
-+        found_introspection="no (disabled, use --enable-introspection to enable)"
-+    ],dnl
-+    [yes],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+                         found_introspection=yes,
-+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-+    ],dnl
-+    [auto],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-+    ],dnl
-+    [dnl	
-+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-+    ])dnl
-+
-+    AC_MSG_RESULT([$found_introspection])
-+
-+    INTROSPECTION_SCANNER=
-+    INTROSPECTION_COMPILER=
-+    INTROSPECTION_GENERATE=
-+    INTROSPECTION_GIRDIR=
-+    INTROSPECTION_TYPELIBDIR=
-+    if test "x$found_introspection" = "xyes"; then
-+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+    fi
-+    AC_SUBST(INTROSPECTION_SCANNER)
-+    AC_SUBST(INTROSPECTION_COMPILER)
-+    AC_SUBST(INTROSPECTION_GENERATE)
-+    AC_SUBST(INTROSPECTION_GIRDIR)
-+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+    AC_SUBST(INTROSPECTION_CFLAGS)
-+    AC_SUBST(INTROSPECTION_LIBS)
-+    AC_SUBST(INTROSPECTION_MAKEFILE)
-+
-+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-+])
-+
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
new file mode 100644
index 00000000000..e3f17518f50
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
@@ -0,0 +1,97 @@
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ m4//introspection.m4	2010-09-20 23:33:07.134254070 +0200
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++    dnl enable/disable introspection
++    m4_if([$2], [require],
++    [dnl
++        enable_introspection=yes
++    ],[dnl
++        AC_ARG_ENABLE(introspection,
++                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++                                 [Enable introspection for this build]),, 
++                                 [enable_introspection=auto])
++    ])dnl
++
++    AC_MSG_CHECKING([for gobject-introspection])
++
++    dnl presence/version checking
++    AS_CASE([$enable_introspection],
++    [no], [dnl
++        found_introspection="no (disabled, use --enable-introspection to enable)"
++    ],dnl
++    [yes],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++                         found_introspection=yes,
++                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++    ],dnl
++    [auto],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++    ],dnl
++    [dnl	
++        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++    ])dnl
++
++    AC_MSG_RESULT([$found_introspection])
++
++    INTROSPECTION_SCANNER=
++    INTROSPECTION_COMPILER=
++    INTROSPECTION_GENERATE=
++    INTROSPECTION_GIRDIR=
++    INTROSPECTION_TYPELIBDIR=
++    if test "x$found_introspection" = "xyes"; then
++       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++    fi
++    AC_SUBST(INTROSPECTION_SCANNER)
++    AC_SUBST(INTROSPECTION_COMPILER)
++    AC_SUBST(INTROSPECTION_GENERATE)
++    AC_SUBST(INTROSPECTION_GIRDIR)
++    AC_SUBST(INTROSPECTION_TYPELIBDIR)
++    AC_SUBST(INTROSPECTION_CFLAGS)
++    AC_SUBST(INTROSPECTION_LIBS)
++    AC_SUBST(INTROSPECTION_MAKEFILE)
++
++    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
new file mode 100644
index 00000000000..198114b6564
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
@@ -0,0 +1,11 @@
+--- bindings/python/Makefile.am.orig	2010-12-01 11:02:01.089105608 +0100
++++ bindings/python/Makefile.am	2010-12-01 11:02:32.619126150 +0100
+@@ -21,7 +21,7 @@
+ indicatedir = $(pkgpyexecdir)/indicate
+ indicate_LTLIBRARIES = _indicate.la
+ 
+-_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6
++_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python@PYTHON_VERSION@ -lpython@PYTHON_VERSION@
+ _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS)  -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS)
+ _indicate_la_SOURCES = indicatemodule.c
+ nodist__indicate_la_SOURCES = indicate.c
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
new file mode 100644
index 00000000000..6376b46d708
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
@@ -0,0 +1,42 @@
+--- configure.ac.orig	2010-09-20 23:15:36.692289201 +0200
++++ configure.ac	2010-09-20 23:17:50.380918143 +0200
+@@ -66,12 +66,20 @@
+ 
+ GDK_PIXBUF_REQUIRED_VERSION=2.12
+ 
++AC_ARG_ENABLE([gtk],
++	AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
++	[enable_gtk=$enableval], enable_gtk=auto)
++AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
++
++if test "x$enable_gtk" != "xno" ; then
+ PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                   gio-2.0 >= $GIO_REQUIRED_VERSION
+                                   gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
+                                   gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                   dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION
+                                   dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
++fi
++
+ AC_SUBST(LIBINDICATEGTK_CFLAGS)
+ AC_SUBST(LIBINDICATEGTK_LIBS)
+ 
+--- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
++++ Makefile.am	2010-09-20 23:17:35.141406450 +0200
+@@ -1,12 +1,15 @@
+ 
+ SUBDIRS = \
+ 	libindicate \
+-	libindicate-gtk \
+ 	bindings \
+ 	examples \
+ 	tests \
+ 	docs
+ 
++if WANT_LIBINDICATEGTK
++SUBDIRS += libindicate-gtk
++endif
++
+ EXTRA_DIST = \
+ 	COPYING.LGPL.2.1 \
+ 	gtk-doc.make \
diff --git a/dev-libs/libindicate/libindicate-0.4.4.ebuild b/dev-libs/libindicate/libindicate-0.4.4.ebuild
index 7ba6e3b2b7b..bc94ce3cc3c 100644
--- a/dev-libs/libindicate/libindicate-0.4.4.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4.ebuild
@@ -33,20 +33,27 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Without patches:
-	# Make gtk optional, launchpad-bug #431311
 	# Make python optional, launchpad-bug #643921
 	# Make mono optional, launchpad-bug #643922
 
+	# Incomplete patches:
+	# Make gtk optional, needs optional-python or code modifications, launchpad-bug #431311
+	#epatch "${FILESDIR}/${P}-optional-gtk.patch"
+
 	# Make doc optional, launchpad-bug #643911
 	epatch "${FILESDIR}/${P}-optional-doc.patch"
 	# Do not compile mono-example by default, launchpad-bug #643912
 	epatch "${FILESDIR}/${P}-optional-mono-example.patch"
 	# Do not compile examples by default, launchpad-bug #643917
 	epatch "${FILESDIR}/${P}-optional-examples.patch"
-	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537
+	# Fix trouble with autoreconf and m4 directory, launchpad-bug #683552
 	epatch "${FILESDIR}/${P}-fix-aclocal.patch"
+	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537
+	epatch "${FILESDIR}/${P}-fix-introspection.patch"
 	# Fix out-of-source builds, launchpad-bug #643913
 	epatch "${FILESDIR}/${P}-fix-out-of-source-build.patch"
+	# Fix compilation for python != 2.6, launchpad-bug #594992
+	epatch "${FILESDIR}/${P}-fix-python-version.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed"
 	eautoreconf