Version bump, remove old, ebuild and patches by Dennis Schridde, bug 332375

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

12 files changed, 313 insertions, 206 deletions

diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index f8b740e04d20..8beaacdcf02e 100644
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-libs/libindicate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.9 2011/01/03 16:28:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.10 2011/01/17 09:34:19 tampakrap Exp $
+
+*libindicate-0.4.4 (17 Jan 2011)
+
+  17 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -libindicate-0.3.6.ebuild,
+  -files/libindicate-0.3.6-no-gobject-introspection.patch,
+  -files/libindicate-0.3.6-optional-gtk-support.patch,
+  +libindicate-0.4.4.ebuild, +files/libindicate-0.4.4-fix-aclocal.patch,
+  +files/libindicate-0.4.4-fix-introspection.patch,
+  +files/libindicate-0.4.4-fix-out-of-source-build.patch,
+  +files/libindicate-0.4.4-fix-python-version.patch,
+  +files/libindicate-0.4.4-optional-doc.patch,
+  +files/libindicate-0.4.4-optional-examples.patch,
+  +files/libindicate-0.4.4-optional-gtk.patch,
+  +files/libindicate-0.4.4-optional-mono-example.patch:
+  Version bump, remove old, ebuild and patches by Dennis Schridde, bug 332375
 
   03 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   libindicate-0.3.6.ebuild:
diff --git a/dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch b/dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch
deleted file mode 100644
index 718b70b08b54..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig   2010-03-31 12:42:16.497596552 +0200
-+++ configure.ac        2010-03-31 12:42:47.001595062 +0200
-@@ -87,6 +87,6 @@
- ###########################
- 
--GOBJECT_INTROSPECTION_CHECK([0.6.3])
-+AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
- 
- ###########################
- # GTK Doc 
diff --git a/dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch b/dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch
deleted file mode 100644
index 38e870a7704a..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Date: Mon, 23 Nov 2009 23:14:01 +0100
-Subject: Make gtk support optional, Fix some QA
-
----
- Makefile.am                 |   17 +++++++----
- configure.ac                |   23 +++++++++++----
- examples/Makefile.am        |   64 ++++++++++++++++++++++---------------------
- libindicate-gtk/Makefile.am |    2 +-
- tests/Makefile.am           |    2 +-
- 5 files changed, 63 insertions(+), 45 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,10 +1,15 @@
-+SUBDIRS = libindicate
- 
--SUBDIRS = \
--	libindicate \
--	libindicate-gtk \
--	examples \
--	tests \
--	docs
-+if HAVE_LIBINDICATEGTK
-+SUBDIRS += libindicate-gtk
-+endif
-+
-+SUBDIRS +=		\
-+	examples	\
-+	tests
-+if INSTALL_DOC
-+SUBDIRS += docs
-+endif
- 
- EXTRA_DIST = \
- 	COPYING.LGPL.2.1 \
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,12 +66,19 @@ AC_SUBST(LIBINDICATE_LIBS)
- 
- 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)
-+
-+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
-+AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
- AC_SUBST(LIBINDICATEGTK_CFLAGS)
- AC_SUBST(LIBINDICATEGTK_LIBS)
- 
-@@ -85,8 +92,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
- # GTK Doc 
- ###########################
- 
-+AC_ARG_ENABLE([doc],
-+	AC_HELP_STRING([--disable-doc], [Do not install API doc]),
-+	[enable_doc=$enableval], [enable_doc=auto])
-+AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"])
- GTK_DOC_CHECK([1.4])
--GNOME_DOC_INIT
-+#GNOME_DOC_INIT
- GNOME_COMPILE_WARNINGS
- 
- ##############################
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -1,35 +1,12 @@
- 
--libexec_PROGRAMS = \
-+EXTRA_PROGRAMS = \
- 	indicate-and-crash \
- 	indicate-alot \
--	listen-and-print \
--	im-client \
- 	show-hide-server
--
--indicate_and_crash_SOURCES = \
--	indicate-and-crash.c
--
--indicate_and_crash_CFLAGS = \
--	-I $(srcdir)/.. \
--	-Wall -Werror \
--	$(LIBINDICATE_CFLAGS)
--
--indicate_and_crash_LDADD = \
--	../libindicate/libindicate.la \
--	$(LIBINDICATE_LIBS)
--
--indicate_alot_SOURCES = \
--	indicate-alot.c
--
--indicate_alot_CFLAGS = \
--	-I $(srcdir)/.. \
--	-Wall -Werror \
--	$(LIBINDICATE_CFLAGS)
--
--indicate_alot_LDADD = \
--	../libindicate/libindicate.la \
--	$(LIBINDICATE_LIBS)
--
-+if HAVE_LIBINDICATEGTK
-+EXTRA_PROGRAMS +=		\
-+	listen-and-print	\
-+	im-client
- listen_and_print_SOURCES = \
- 	listen-and-print.c
- 
-@@ -40,8 +16,8 @@ listen_and_print_CFLAGS = \
- 	$(LIBINDICATEGTK_CFLAGS)
- 
- listen_and_print_LDADD = \
--	../libindicate/libindicate.la \
--	../libindicate-gtk/libindicate-gtk.la \
-+	$(top_srcdir)/libindicate/libindicate.la \
-+	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- 	$(LIBINDICATE_LIBS) \
- 	$(LIBINDICATEGTK_LIBS)
- 
-@@ -55,10 +30,33 @@ im_client_CFLAGS = \
- 	$(LIBINDICATEGTK_CFLAGS)
- 
- im_client_LDADD = \
--	../libindicate/libindicate.la \
--	../libindicate-gtk/libindicate-gtk.la \
-+	$(top_srcdir)/libindicate/libindicate.la \
-+	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- 	$(LIBINDICATE_LIBS) \
- 	$(LIBINDICATEGTK_LIBS)
-+endif
-+
-+indicate_and_crash_SOURCES = \
-+	indicate-and-crash.c
-+
-+indicate_and_crash_CFLAGS = \
-+	-I $(srcdir)/.. \
-+	$(LIBINDICATE_CFLAGS)
-+
-+indicate_and_crash_LDADD = \
-+	$(top_srcdir)/libindicate/libindicate.la \
-+	$(LIBINDICATE_LIBS)
-+
-+indicate_alot_SOURCES = \
-+	indicate-alot.c
-+
-+indicate_alot_CFLAGS = \
-+	-I $(srcdir)/.. \
-+	$(LIBINDICATE_CFLAGS)
-+
-+indicate_alot_LDADD = \
-+	$(top_srcdir)/libindicate/libindicate.la \
-+	$(LIBINDICATE_LIBS)
- 
- show_hide_server_SOURCES = \
- 	show-hide-server.c
-@@ -69,7 +66,7 @@ show_hide_server_CFLAGS = \
- 	$(LIBINDICATE_CFLAGS)
- 
- show_hide_server_LDADD = \
--	../libindicate/libindicate.la \
-+	$(top_srcdir)/libindicate/libindicate.la \
- 	$(LIBINDICATE_LIBS)
- 
- examplesdir = $(docdir)/examples/
---- a/libindicate-gtk/Makefile.am
-+++ b/libindicate-gtk/Makefile.am
-@@ -33,7 +33,7 @@ libindicate_gtk_la_CFLAGS = \
- 	$(LIBINDICATEGTK_CFLAGS)
- 
- libindicate_gtk_la_LIBADD = \
--	../libindicate/libindicate.la \
-+	$(top_srcdir)/libindicate/libindicate.la \
- 	$(LIBINDICATEGTK_LIBS)
- 
- pkgconfig_DATA = indicate-gtk.pc
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
new file mode 100644
index 000000000000..d7184a39ec3e
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
@@ -0,0 +1,7 @@
+--- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
++++ Makefile.am	2010-09-20 23:12:20.591583239 +0200
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = \
+ 	libindicate \
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 000000000000..e3f17518f50a
--- /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-out-of-source-build.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
new file mode 100644
index 000000000000..a87440e605ba
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
@@ -0,0 +1,51 @@
+--- examples/Makefile.am.orig	2010-09-20 23:42:07.380545155 +0200
++++ examples/Makefile.am	2010-09-20 23:43:31.231899979 +0200
+@@ -18,7 +18,7 @@
+ 	$(LIBINDICATE_CFLAGS)
+ 
+ indicate_and_crash_LDADD = \
+-	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
+ 	$(LIBINDICATE_LIBS)
+ 
+ indicate_alot_SOURCES = \
+@@ -30,7 +30,7 @@
+ 	$(LIBINDICATE_CFLAGS)
+ 
+ indicate_alot_LDADD = \
+-	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
+ 	$(LIBINDICATE_LIBS)
+ 
+ listen_and_print_SOURCES = \
+@@ -43,8 +43,8 @@
+ 	$(LIBINDICATEGTK_CFLAGS)
+ 
+ listen_and_print_LDADD = \
+-	../libindicate/libindicate.la \
+-	../libindicate-gtk/libindicate-gtk.la \
++	$(top_srcdir)/libindicate/libindicate.la \
++	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
+ 	$(LIBINDICATE_LIBS) \
+ 	$(LIBINDICATEGTK_LIBS)
+ 
+@@ -58,8 +58,8 @@
+ 	$(LIBINDICATEGTK_CFLAGS)
+ 
+ im_client_LDADD = \
+-	../libindicate/libindicate.la \
+-	../libindicate-gtk/libindicate-gtk.la \
++	$(top_srcdir)/libindicate/libindicate.la \
++	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
+ 	$(LIBINDICATE_LIBS) \
+ 	$(LIBINDICATEGTK_LIBS)
+ 
+@@ -72,7 +72,7 @@
+ 	$(LIBINDICATE_CFLAGS)
+ 
+ show_hide_server_LDADD = \
+-	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
+ 	$(LIBINDICATE_LIBS)
+ 
+ python_examples = \
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 000000000000..198114b65647
--- /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-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
new file mode 100644
index 000000000000..b4f6d6f9dbbc
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
@@ -0,0 +1,36 @@
+--- configure.ac.orig	2010-09-20 23:15:36.692289201 +0200
++++ configure.ac	2010-09-20 23:26:30.159014141 +0200
+@@ -171,8 +171,18 @@
+ # GTK Doc 
+ ###########################
+ 
++AC_ARG_ENABLE([doc],
++	AC_HELP_STRING([--disable-doc], [Disable doc generation]),
++	[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
+ 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
+ 
+ ##############################
+--- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
++++ Makefile.am	2010-09-20 23:27:12.557785756 +0200
+@@ -5,7 +5,10 @@
+ 	bindings \
+ 	examples \
+-	tests \
+-	docs
++	tests
++
++if WANT_DOC
++SUBDIRS += docs
++endif
+ 
+ EXTRA_DIST = \
+ 	COPYING.LGPL.2.1 \
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
new file mode 100644
index 000000000000..8e2e03644040
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
@@ -0,0 +1,11 @@
+--- examples/Makefile.am.orig	2010-09-20 23:42:07.380545155 +0200
++++ examples/Makefile.am	2010-09-20 23:57:17.405792954 +0200
+@@ -2,7 +2,7 @@
+ CSFILES = IndicatorMonoExample.cs
+ CLEANFILES = $(ASSEMBLY)
+ 
+-libexec_PROGRAMS = \
++EXTRA_PROGRAMS = \
+ 	indicate-and-crash \
+ 	indicate-alot \
+ 	listen-and-print \
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 000000000000..6376b46d7089
--- /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/files/libindicate-0.4.4-optional-mono-example.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
new file mode 100644
index 000000000000..97cb78ce3c44
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
@@ -0,0 +1,8 @@
+--- examples/Makefile.am.orig	2010-09-20 23:42:07.380545155 +0200
++++ examples/Makefile.am	2010-09-20 23:44:49.173431396 +0200
+@@ -97,5 +97,3 @@
+ $(ASSEMBLY): $(CSFILES) Makefile.am
+ 	$(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
+ 	chmod a+x indicator-mono-example
+-
+-all: $(ASSEMBLY)
diff --git a/dev-libs/libindicate/libindicate-0.3.6.ebuild b/dev-libs/libindicate/libindicate-0.4.4.ebuild
index 6f710ff1fb68..f812b18e16dc 100644
--- a/dev-libs/libindicate/libindicate-0.3.6.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.3.6.ebuild,v 1.2 2011/01/03 16:28:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.1 2011/01/17 09:34:20 tampakrap Exp $
 
 EAPI=2
 
@@ -13,8 +13,8 @@ SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+do
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk doc"
-# They put their mother in the tarball ? ^^
+IUSE="doc"
+
 RESTRICT="test"
 
 # For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667
@@ -22,32 +22,51 @@ RDEPEND="dev-libs/glib:2
 	dev-libs/dbus-glib
 	dev-libs/libdbusmenu
 	dev-libs/libxml2:2
-	gtk? ( x11-libs/gtk+:2 )"
+	x11-libs/gtk+:2
+	dev-python/pygtk
+	dev-dotnet/gtk-sharp
+	dev-dotnet/gtk-sharp-gapi"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
 	dev-util/gtk-doc-am
 	dev-util/pkgconfig"
 
 src_prepare() {
-	# Make libindicator-gtk library optional, launchpad-bug #431311
-	epatch "${FILESDIR}/${P}-optional-gtk-support.patch"
+	# Without patches:
+	# 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"
+	# 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}-no-gobject-introspection.patch"
+	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
 }
 
 src_configure() {
-	local my_conf
-
 	# gobject-instrospection is a nightmare in this package, it's fixable for libindicate
 	# and not for libindicate-gtk, disable it until its fixed on upstream
-	my_conf="--disable-dependency-tracking
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable gtk)
-		$(use_enable doc)"
-	econf $my_conf
+	econf \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable doc) \
+		|| die "configure failed"
 }
 
 src_test() {