[dev-libs/libindicate] Improve patches based on upstream request, revbump

(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)

8 files changed, 88 insertions, 35 deletions

diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 343dad95894..f63a680c603 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -6,22 +6,22 @@ AUX libindicate-0.4.4-fix-introspection.patch 3690 RMD160 d64ff2fb723ba13fc7418e
 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-mono-parallel-make.patch 350 RMD160 0a43c9df9e05a40e6e1ab8d26922573d92904e74 SHA1 a9ef4e3c93801a7b6c2a7bb7241119ec87e3a8ea SHA256 5ab8226ecdeb7c9aacb2b713847054c4be8e34897b690aea4edb7ea8fb3f841b
-AUX libindicate-0.4.4-optional-doc.patch 878 RMD160 8173d4ae6a8154361a49f1143abe048d266dfc78 SHA1 e563b340de70aa7ced2c3dd33840814cfbc17baa SHA256 767317c501fd6e6c526b6c4854cfa0ebde0995192446a48b22de9f0fdc43ce33
+AUX libindicate-0.4.4-optional-doc.patch 1144 RMD160 3438e3cc559f29305e971ff32918a399f3792ba9 SHA1 d3f2d31af41d7bbc33384143f5edfe3469a941fc SHA256 e4f75b155204d8da75b805dfffe4a6fbb769d001d38eed6bcf3489ac983af445
 AUX libindicate-0.4.4-optional-examples.patch 310 RMD160 08c649cbafbc742562179e09d2ecb3a52f790144 SHA1 908d5812dbaee1fd7f9a03e60864815af7d84e0f SHA256 cdb14c7848ef1b4cb828a2e865d7945116b21ad6890bd41b7da5320ff3994a63
-AUX libindicate-0.4.4-optional-gtk.patch 796 RMD160 f42b2ed5254bfa6d87b90c8330610b32bc6595fc SHA1 5c27abc06e8516a84334130a5921d0dba5cb8fa6 SHA256 6b9181fa91b8d9b4a5bb8f962800468065b3bb0c48ff8f8b6e1d2854ffe78ae1
+AUX libindicate-0.4.4-optional-gtk.patch 1265 RMD160 aa1b20934bc3ea277709772755ad3428269f5cf2 SHA1 8f3d3325365b4b96570a93530c8f8aea9295b617 SHA256 95a3678ac1f6fc7b58544c16ddf0a7a5d98321e07b736ff3d4feb530a8a0bcf2
 AUX libindicate-0.4.4-optional-mono-example.patch 321 RMD160 70cdade62938796b70a6c7a0696b6976b8f8d93c SHA1 7481c1a7a0d478f638eefdc79d05331581321406 SHA256 dc68fd7ba8f03618f2f6f369652ba7a6f72b921190e751667afcbf70be393f5f
-AUX libindicate-0.4.91-fix-python-version.patch 936 RMD160 7eaff60ac64d15f003d31745f72ae6b2764cecb9 SHA1 9c1794646d0479cbbeee058e672b55e528cc7d25 SHA256 07e99de8c0fed0d30150ccf22b517c5f8961448c3d85dd905b696c3a04a255ea
-AUX libindicate-0.4.91-optional-mono.patch 977 RMD160 d108dee2e534d904f0fcd0caa23b8ed2572cae9b SHA1 a6b7ba8963d0ab3a192f8b39b698db6d9c7d5364 SHA256 eaeee1a3137d800fd85677acb17ab09a27026fdb90e76f5cba7646637b8db52a
-AUX libindicate-0.4.91-optional-python.patch 1051 RMD160 94daa3a2132caf620d46ac955a19c16e2d48a860 SHA1 d25ae3d2c4c15b8ac3dcb8edfb13bdefa7f9f3a2 SHA256 394951e56c8ccdb13478593287f3d3f2536722fee2295c49e76e14953aba65cb
+AUX libindicate-0.4.91-fix-python-version.patch 1056 RMD160 0a82d98948ed932ab22acecd3f70b7e51f7b2e50 SHA1 ff878335e5794ae148522417559fb3280bac09bb SHA256 cbe1db86aa486e1ce9357aa27c1ff112acd2c0eac9701b218efdb1433b176845
+AUX libindicate-0.4.91-optional-mono.patch 1246 RMD160 e8951cf8978eeb0d25d7f438d92761d494d9dab0 SHA1 d411e61cd8cf359e5df9860a46111fe7679de7a8 SHA256 ecb72e7e7ee241d5ea3b31473681f6960fc9e7bb48b681b4e12e50761a9750d5
+AUX libindicate-0.4.91-optional-python.patch 1495 RMD160 6eb24678f376c4185453d57f684d1d82edb8984b SHA1 8cf3346e24b940e6d609553151070753d6031937 SHA256 121380055f5aa178446c722c9eb81104f9e9c3dac016ff1b0a0254ebf4e34aec
 DIST libindicate-0.4.4.tar.gz 473110 RMD160 2e926172d8b0a2604f44b2b42ee70f3a1fc837f9 SHA1 0dc3ad4c35581adea9d9ae89daacf820c764f24a SHA256 20d7ac6fe02b28283c619fe583d5b0fb8a473bb17ef020c2fa40c53f72e315ce
 DIST libindicate-0.4.91.tar.gz 501873 RMD160 c7e3e7ddad51c8225c900c6ea7a89e1259a3b186 SHA1 dc2b9a6a987e9a8e82daa5940d83142f379369e8 SHA256 c80538a2423e9b9f1d22877b6b722f37914a7c747e694424735b9fc255f50d58
-EBUILD libindicate-0.4.4-r1.ebuild 2881 RMD160 385de7f5eae6b5229b0d3c4634bd432eab906bc7 SHA1 400af1e45aa28943329d6fc9747299dc13aeb31c SHA256 e1a959653fb1d287b677b6cafe40af72334a6f24e66429dffdba2dcd24761a28
-EBUILD libindicate-0.4.91.ebuild 3896 RMD160 b5a03c3abd870dbfe018bc36b0e624d03fcc6a74 SHA1 4ff0f2ae9bafe156e0689bf59417b3dba80cffd6 SHA256 5bba1d564103860853f7a0b22003fbe791169591b5c157ed995be58ac4f3dd9c
+EBUILD libindicate-0.4.4-r2.ebuild 2881 RMD160 385de7f5eae6b5229b0d3c4634bd432eab906bc7 SHA1 400af1e45aa28943329d6fc9747299dc13aeb31c SHA256 e1a959653fb1d287b677b6cafe40af72334a6f24e66429dffdba2dcd24761a28
+EBUILD libindicate-0.4.91-r2.ebuild 3896 RMD160 b5a03c3abd870dbfe018bc36b0e624d03fcc6a74 SHA1 4ff0f2ae9bafe156e0689bf59417b3dba80cffd6 SHA256 5bba1d564103860853f7a0b22003fbe791169591b5c157ed995be58ac4f3dd9c
 MISC metadata.xml 366 RMD160 aaed9ac306fbf7c939c135e5ce428fd8e7ccae69 SHA1 945981181f6751b4f3927ca443ee8031279fef30 SHA256 d6322d845754bcc6abcc2288430c2343be3bdb848ce7ef385f7f1e586fb91ec0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1NZEEACgkQjqfyF1DtJW4xVACfVRV9ccR2Mw6OlKuCIxkte9jd
-vMwAoIZFhWhvY4eOis5I2YL633lEPplf
-=qbDW
+iEYEARECAAYFAk1Nw/sACgkQjqfyF1DtJW573gCcDI+DCjQeubWvJ4giNmZfcf36
+IHkAniM7DCtndwZL6er8v9nG6D+o17b8
+=TNYa
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
index 857bc7acd23..13c09f90fc8 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
@@ -6,19 +6,29 @@
  
 +AC_ARG_ENABLE([doc],
 +	AC_HELP_STRING([--disable-doc], [Disable doc generation]),
-+	[enable_doc=$enableval], enable_doc=auto)
++	[enable_doc=$enableval], [enable_doc=auto])
 +AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
 +
  GTK_DOC_CHECK([1.4])
-+if test "x$enable_doc" != "xno" ; then
++AS_IF([test "x$enable_doc" != "xno"],[
  GNOME_DOC_INIT
-+else
++],[
 +# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
 +GNOME_DOC_INIT(,,[:])
-+fi
++])
  GNOME_COMPILE_WARNINGS
  
  ##############################
+@@ -271,2 +281,7 @@
+-	GObject Introspection:  $enable_introspection
+-])
++	GObject Introspection:  $enable_introspection
++])
++
++AM_COND_IF([HAVE_GNOME_DOC_UTILS],
++	[AC_MSG_NOTICE([	Documentation:          yes])],
++	[AC_MSG_NOTICE([	Documentation:          no])]
++)
 --- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
 +++ Makefile.am	2010-09-20 23:27:12.557785756 +0200
 @@ -1,2 +1,6 @@
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
index 90272e341da..2c5b2592a3b 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
@@ -4,17 +4,31 @@
  
 +AC_ARG_ENABLE([gtk],
 +	AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
-+	[enable_gtk=$enableval], enable_gtk=auto)
++	[enable_gtk=$enableval], [enable_gtk=auto])
 +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
 +
-+if test "x$enable_gtk" != "xno" ; then
++AS_IF([test "x$enable_gtk" != "xno"],[
  GDK_PIXBUF_REQUIRED_VERSION=2.12
  
-@@ -75,3 +66,4 @@
+@@ -74,4 +80,7 @@
+-                                  dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
++                                  dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
++                                  [have_gtk=yes]
++)
  AC_SUBST(LIBINDICATEGTK_CFLAGS)
  AC_SUBST(LIBINDICATEGTK_LIBS)
-+fi
++])
  
+@@ -271,2 +280,7 @@
+-	GObject Introspection:  $enable_introspection
+-])
++	GObject Introspection:  $enable_introspection
++])
++
++AS_IF([test "x$have_gtk" = "xyes"],
++	[AC_MSG_NOTICE([	Gtk:                    yes])],
++	[AC_MSG_NOTICE([	Gtk:                    no])]
++)
 --- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
 +++ Makefile.am	2010-09-20 23:17:35.141406450 +0200
 @@ -1,5 +1,9 @@
diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
index 357c6e3d049..c08f982ac7a 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2011-01-29 21:38:44.667942630 +0100
 +++ configure.ac	2011-01-29 21:42:03.892863493 +0100
-@@ -153,13 +153,14 @@
+@@ -153,15 +153,16 @@
 -AM_PATH_PYTHON(2.3.5)
 -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 -
@@ -9,13 +9,16 @@
  PYGOBJECT_REQUIRED=0.22
  
 -PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
--				    pygobject-2.0 >= $PYGOBJECT_REQUIRED])
-+AM_PATH_PYTHON($PYTHON_REQUIRED)
+-                   pygobject-2.0 >= $PYGOBJECT_REQUIRED],
+-                   [have_python=yes]
++AM_PATH_PYTHON([$PYTHON_REQUIRED])
 +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 +
-+PKG_CHECK_MODULES(INDICATE_PYTHON, python-$PYTHON_VERSION >= $PYTHON_REQUIRED
-+                                   pygtk-2.0 >= $PYGTK_REQUIRED
-+                                   pygobject-2.0 >= $PYGOBJECT_REQUIRED)
++PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED
++                                      pygtk-2.0 >= $PYGTK_REQUIRED
++                                      pygobject-2.0 >= $PYGOBJECT_REQUIRED],
++                                     [have_python=yes]
+ )
  
 -INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
  # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
index 323224ad1c7..d663389db9b 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
@@ -6,10 +6,10 @@
  
 +AC_ARG_ENABLE([mono],
 +	AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
-+	[enable_mono=$enableval], enable_mono=auto)
++	[enable_mono=$enableval], [enable_mono=auto])
 +AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
 +
-+if test "x$enable_mono" != "xno" ; then
++AS_IF([test "x$enable_mono" != "xno"],[
  MONO_REQUIRED_VERSION=1.0
  PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
  
@@ -17,10 +17,20 @@
  AC_SUBST(GAPI_CODEGEN)
  AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
  AC_SUBST(GAPI_FIXUP)
-+fi
++])
  
  ###########################
  # Check for Python support
+@@ -273,2 +280,7 @@
+-	GObject Introspection:  $enable_introspection
+-])
++	GObject Introspection:  $enable_introspection
++])
++
++AS_IF([test "x$has_mono" = "xtrue"],
++	[AC_MSG_NOTICE([	Mono bindings:          yes])],
++	[AC_MSG_NOTICE([	Mono bindings:          no])]
++)
 --- bindings/Makefile.am.orig	2011-01-29 21:10:05.095991987 +0100
 +++ bindings/Makefile.am	2011-01-29 21:11:06.349142195 +0100
 @@ -1,2 +1,6 @@
diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
index cb058bc7e25..43d42fbd22f 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
@@ -1,28 +1,44 @@
 --- configure.ac.orig	2011-01-29 21:51:17.724952231 +0100
 +++ configure.ac	2011-01-29 21:52:29.969745013 +0100
-@@ -153,4 +153,14 @@
+@@ -146,4 +146,14 @@
  # Check for Python support
  ###########################
  
 +AC_ARG_ENABLE([python],
 +	AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
-+	[enable_python=$enableval], enable_python=auto)
++	[enable_python=$enableval], [enable_python=auto])
 +AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
 +
-+if test "x$enable_python" != "xno" ; then
-+if test "x$enable_gtk" = "xno" ; then
-+	AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
-+fi
++AS_IF([test "x$enable_python" != "xno"],[
++	AS_IF([test "x$have_gtk" != "xyes"],[
++		AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
++	])
 +
  AM_PATH_PYTHON(2.3.5)
-@@ -179,6 +185,7 @@
+@@ -156,2 +166,4 @@
+-				    pygobject-2.0 >= $PYGOBJECT_REQUIRED])
++                   pygobject-2.0 >= $PYGOBJECT_REQUIRED],
++                   [have_python=yes]
++)
+ 
+@@ -171,6 +183,7 @@
  PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
  AC_SUBST(PYGTK_CODEGEN)
  AC_MSG_RESULT($PYGTK_CODEGEN)
-+fi
++])
  
  ###########################
  # GTK Doc 
+@@ -271,2 +284,7 @@
+-	GObject Introspection:  $enable_introspection
+-])
++	GObject Introspection:  $enable_introspection
++])
++
++AS_IF([test "x$have_python" = "xyes"],
++	[AC_MSG_NOTICE([	Python bindings:        yes])],
++	[AC_MSG_NOTICE([	Python bindings:        no])]
++)
 --- bindings/Makefile.am.orig	2011-01-29 21:53:17.826282713 +0100
 +++ bindings/Makefile.am	2011-01-29 21:53:52.951209371 +0100
 @@ -1,2 +1,6 @@
diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
index 5dd78c45738..5dd78c45738 100644
--- a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
diff --git a/dev-libs/libindicate/libindicate-0.4.91.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
index 556ecc6d963..556ecc6d963 100644
--- a/dev-libs/libindicate/libindicate-0.4.91.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild