Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde

25 files changed, 946 insertions, 79 deletions

diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 009c6365ea4..b535f0eaba6 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libdbusmenu-0.3.14-fix-aclocal.patch 201 RMD160 318e6abd0d997bcf2aee6fe869f87ef1571f521c SHA1 6dcf3e5a1b2ac26fec0e8655de965577b114dbc7 SHA256 9a872801a0d3c319abea5e789ebf47f7f302da8a864265623d20bd468c8326e5
 AUX libdbusmenu-0.3.14-optional-dumper.patch 930 RMD160 71eca829ce52cdcef4444bbb05de35fa576c08a2 SHA1 1224c84de413b7855f8a86ab4de8b7566b8c5ccb SHA256 0edcc9960eb76439e72a72e0b70742b847a7ad58efd1916caf8493b4ea509df7
 AUX libdbusmenu-0.3.16-decouple-testapp.patch 349 RMD160 44eca28765906a5d344e6e641721821dc762812c SHA1 a54728d048dd368fe074195d0ea6032c202c4955 SHA256 3cd97bb99354088deae159565304187c10b4ad10573e92d14bd130d98a90c4a6
-AUX libdbusmenu-0.3.16-optional-gtk.patch 2154 RMD160 636acf8e09c4bd5981f0c657c3456817380ad968 SHA1 6e727a2b125fbaee18e61d7ecfa609e9ae3f1b42 SHA256 072122462b044e18f19f28e57aef7267273b1d94d678a212dd0d87c7dc3eacba
-AUX libdbusmenu-0.3.16-optional-tests.patch 1252 RMD160 afdd144622b322d9d6fe668d09ebd7a80f6d3966 SHA1 62aae2d1ea2a55519b989f34ab07c4ccdea3c256 SHA256 43b77be0784fd254bd651f65834b8ca13017266c1aeb73bcb655ff8e96f5e1f0
-AUX libdbusmenu-0.3.16-parallel-make.patch 297 RMD160 c700649cb5a08ec0f911d24e59777fa941e73803 SHA1 880150e7e53f3ef22dc6c0cb037c0d339ecb6689 SHA256 9d41ae601b527b9696cefb5b069fd742987125c3d4bf8eea5aec241393f7352f
+AUX libdbusmenu-0.3.16-optional-gtk.patch 2099 RMD160 a77bdfc887f3805271a7a7189595dea8bbc22980 SHA1 731cba8db4448e95514f392da67e6ca442af548a SHA256 5e22c89eee491ef31448e980772953d73e401c10eff3ac339c1f6ce0a0ef27f9
+AUX libdbusmenu-0.3.16-optional-tests.patch 1231 RMD160 a074e3f9e9b9322a14a183725af96f3e09dfeeff SHA1 847e17fd09c284f88aa39471b163871e65ec5b2b SHA256 f07acd7b39d299e0c425bdafd90a300e748d46857eff06f8b55ea1440ee3dabb
+AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d
+AUX libdbusmenu-0.3.94-optional-gtk.patch 3029 RMD160 013bf4c7fa5385bf69f87a5fc438a1426c5dc894 SHA1 d29f51cb6155a05b8c5a5f336223fdea6a501d69 SHA256 efe1fe1d5e6861e614c9741495395399ece1872d1f3ce2a7acdc8e825c5034f9
 DIST libdbusmenu-0.3.16.tar.gz 534381 RMD160 fcacb2fa11a2a51bd053eac81680bc50e643d21d SHA1 b10bce4f7049980e05fe96d5483c880b065fe105 SHA256 3b5dc86a7a298641586a306a837efd5817a65df1947601f696189b8afedb9683
-EBUILD libdbusmenu-0.3.16.ebuild 2020 RMD160 f40c3940df9619705926ee3a608e4a43d672772d SHA1 d6816b1dd175eace6ce2fedc9103e1338560a928 SHA256 6ffff514a6341d149b4ee78736c43a6d8935980451d4b9cf6280642872e5b0c6
-MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
+DIST libdbusmenu-0.3.94.tar.gz 614544 RMD160 5ede1948800fd2cf1721ff70f950c52865a78bd4 SHA1 9b06ac06c5d4248ce9e33d0c797c5b9c5b5d1ba7 SHA256 8cc600632ed894ba26d624cc9ad375da63bfed01f665ab6e2e2299567c6d95e5
+EBUILD libdbusmenu-0.3.16.ebuild 1913 RMD160 00bdd5ac5930d5c7cc706e3030cb61c2fa6db1ff SHA1 fcf2fa77b4cc250eb4fe9aa9bd5c9034791a9b1e SHA256 fef352a4bceeb87f7bc4fe5127d421fbf782259b4ac3bbac48fe982e6668748a
+EBUILD libdbusmenu-0.3.94.ebuild 2253 RMD160 0043b5098cdeb2c9d330912a580340d7c21a234e SHA1 142428e201298d88ab10dd903c14a4acc8b01ead SHA256 7e4f383b1b4aa06f3a2b330b1c20ede4f7ec59fb3edb5941dde336913da1bb25
+MISC metadata.xml 349 RMD160 443a29e0117c63734151e49b36fcd9828a809eff SHA1 3f5030351df63351e33aeb2cf003cfce9929c85a SHA256 763b46eab82cb42368815f31d25dff2c135a7af66454abb2e021574f55450378
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1EqAgACgkQjqfyF1DtJW7HXACgjBMkMSLn5Lu5Kzqr5GcVlC5b
+LXwAn05HA9O98KCNeLMACAUeXC+zFzIC
+=bz3y
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
index 7fdc051c765..dd33d4a1f36 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
@@ -20,21 +20,17 @@
  AC_SUBST(DBUSMENUGTK_LIBS)
 --- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
 +++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
-@@ -5,10 +5,13 @@
+@@ -5,5 +5,9 @@
  
++if WANT_LIBDBUSMENUGTK
++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
++endif
++
  SUBDIRS = \
  	libdbusmenu-glib \
 -	libdbusmenu-gtk \
++	$(LIBDBUSMENUGTK_SUBDIR) \
  	tools \
- 	tests \
- 	docs \
- 	po
- 
-+if WANT_LIBDBUSMENUGTK
-+SUBDIRS += libdbusmenu-gtk
-+endif
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 --- tests/Makefile.am.orig	2011-01-29 14:37:11.863805482 +0100
 +++ tests/Makefile.am	2011-01-29 14:38:48.910883303 +0100
 @@ -11,12 +11,16 @@
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
index b0518717c1e..a6d05369f15 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
@@ -18,17 +18,18 @@
  AC_SUBST(DBUSMENUTESTS_LIBS)
 --- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
 +++ Makefile.am	2010-09-20 22:01:55.525674385 +0200
-@@ -9,6 +9,9 @@
- 	tools \
--	tests \
- 	docs \
- 	po
+@@ -5,2 +5,6 @@
  
 +if WANT_TESTS
-+SUBDIRS += tests
++TESTS_SUBDIR = tests
 +endif
 +
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
+ SUBDIRS = \
+@@ -9,3 +9,3 @@
+ 	tools \
+-	tests \
++	$(TESTS_SUBDIR) \
+ 	docs \
 --- tools/testapp/Makefile.am.orig    2011-01-29 13:42:00.984605528 +0100
 +++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
 @@ -1,5 +1,9 @@
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
deleted file mode 100644
index ed605df58c5..00000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2011-01-29 13:49:42.828302898 +0100
-+++ Makefile.am	2011-01-29 13:50:45.096371768 +0100
-@@ -21,4 +21,8 @@
- 
-+libdbusmenu-gtk: libdbusmenu-glib
-+tests: libdbusmenu-gtk
-+tools: libdbusmenu-gtk
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
- 
- dist-hook:
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch
new file mode 100644
index 00000000000..64812a40010
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch
@@ -0,0 +1,20 @@
+--- tools/testapp/Makefile.am.orig	2011-01-29 20:50:54.266939219 +0100
++++ tools/testapp/Makefile.am	2011-01-29 20:51:16.185268917 +0100
+@@ -1,10 +1,4 @@
+ 
+-if USE_GTK3
+-VER=3
+-else
+-VER=
+-endif
+-
+ libexec_PROGRAMS =
+ 
+ if WANT_TESTS
+@@ -22,6 +16,4 @@
+ 
+ dbusmenu_testapp_LDADD = \
+ 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
+-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
+-	$(DBUSMENUGTK_LIBS) \
+ 	$(DBUSMENUTESTS_LIBS)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
new file mode 100644
index 00000000000..c19ee998026
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
@@ -0,0 +1,106 @@
+--- configure.ac.orig	2011-01-29 20:37:03.892284177 +0100
++++ configure.ac	2011-01-29 20:42:10.969923186 +0100
+@@ -58,29 +58,35 @@
+ GTK_REQUIRED_VERSION=2.16
+ GTK3_REQUIRED_VERSION=2.91
+ 
++AC_ARG_ENABLE([gtk],
++	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
++	[enable_gtk=$enableval], enable_gtk=auto)
++AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
++
+ AC_ARG_WITH([gtk],
+   [AS_HELP_STRING([--with-gtk],
+     [Which version of gtk to use @<:@default=2@:>@])],
+   [],
+   [with_gtk=2])
++AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
++
++if test "x$enable_gtk" != "xno" ; then
+ AS_IF([test "x$with_gtk" = x3],
+         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
+-         AC_SUBST(DBUSMENUGTK_CFLAGS)
+-         AC_SUBST(DBUSMENUGTK_LIBS)
+          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
+         ],
+       [test "x$with_gtk" = x2],
+         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
+-         AC_SUBST(DBUSMENUGTK_CFLAGS)
+-         AC_SUBST(DBUSMENUGTK_LIBS)
+         ],
+       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
+ )
+-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
++fi
++AC_SUBST(DBUSMENUGTK_CFLAGS)
++AC_SUBST(DBUSMENUGTK_LIBS)
+ 
+ ###########################
+ # Dependencies - dumper
+--- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
++++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
+@@ -5,5 +5,9 @@
+ 
++if WANT_LIBDBUSMENUGTK
++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
++endif
++
+ SUBDIRS = \
+ 	libdbusmenu-glib \
+-	libdbusmenu-gtk \
++	$(LIBDBUSMENUGTK_SUBDIR) \
+ 	tools \
+--- tests/Makefile.am.orig	2011-01-29 20:47:16.721588701 +0100
++++ tests/Makefile.am	2011-01-29 20:45:10.116455527 +0100
+@@ -11,13 +11,17 @@
+ 	test-glib-proxy \
+ 	test-glib-simple-items \
+ 	test-glib-submenu \
+-	test-json \
++	test-json
++
++if WANT_LIBDBUSMENUGTK
++TESTS += \
+ 	test-gtk-objects-test \
+ 	test-gtk-label \
+ 	test-gtk-shortcut \
+ 	test-gtk-reorder \
+ 	test-gtk-submenu \
+ 	test-gtk-parser-test
++endif
+ 
+ check_PROGRAMS = \
+ 	glib-server-nomenu \
+@@ -31,20 +35,24 @@
+ 	test-glib-proxy-client \
+ 	test-glib-proxy-server \
+ 	test-glib-proxy-proxy \
+-	test-gtk-objects \
+ 	test-glib-submenu-client \
+ 	test-glib-submenu-server \
++	test-glib-simple-items \
++	test-json-client \
++	test-json-server
++
++if WANT_LIBDBUSMENUGTK
++check_PROGRAMS += \
++	test-gtk-objects \
+ 	test-gtk-label-client \
+ 	test-gtk-label-server \
+ 	test-gtk-shortcut-client \
+ 	test-gtk-shortcut-server \
+-	test-glib-simple-items \
+ 	test-gtk-reorder-server \
+-	test-json-client \
+-	test-json-server \
+ 	test-gtk-submenu-server \
+ 	test-gtk-submenu-client \
+ 	test-gtk-parser
++endif
+ 
+ XVFB_RUN=". $(srcdir)/run-xvfb.sh"
+ 
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
index 877b458aed9..e3e418fee4d 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
@@ -23,18 +23,16 @@ RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2:2
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-    introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	test? ( dev-libs/json-glib[introspection=] )
 	dev-util/intltool
 	dev-util/pkgconfig"
 
 src_prepare() {
-	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
-	epatch "${FILESDIR}/${P}-optional-gtk.patch"
 	# Make tests optional, launchpad-bug #552526
 	epatch "${FILESDIR}/${P}-optional-tests.patch"
-	# Try to make parallel-make safe, launchpad-bug #709762
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
+	epatch "${FILESDIR}/${P}-optional-gtk.patch"
 	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
 	epatch "${FILESDIR}/${P}-decouple-testapp.patch"
 	# Make dbusmenudumper optional, launchpad-bug #643871
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
new file mode 100644
index 00000000000..7317cc548d8
--- /dev/null
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.2.8.ebuild,v 1.2 2010/09/14 07:41:41 reavertm Exp $
+
+EAPI=3
+
+inherit autotools eutils versionator
+
+MY_MAJOR_VERSION="$(get_version_component_range 1-2)"
+if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then
+	MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))"
+fi
+
+DESCRIPTION="Library to pass menu structure across DBus"
+HOMEPAGE="https://launchpad.net/dbusmenu"
+SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk3 +introspection test"
+
+# Needs dev-util/dbus-test-runner (not yet in tree)
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gtk? (
+		gtk3? ( x11-libs/gtk+:3 )
+		!gtk3? ( x11-libs/gtk+:2 )
+	)"
+DEPEND="${RDEPEND}
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	test? ( dev-libs/json-glib[introspection=] )
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Make tests optional, launchpad-bug #552526
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch"
+	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
+	epatch "${FILESDIR}/${P}-optional-gtk.patch"
+	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
+	epatch "${FILESDIR}/${P}-decouple-testapp.patch"
+	# Make dbusmenudumper optional, launchpad-bug #643871
+	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
+	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
+	epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch"
+	# Drop -Werror in a release
+	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	local conf
+	if use gtk3 ; then
+		conf="${conf} --with-gtk=3"
+	else
+		conf="${conf} --with-gtk=2"
+	fi
+
+	econf \
+		$(use_enable gtk) \
+		$(use_enable gtk dumper) \
+		$(use_enable introspection) \
+		$(use_enable test tests) \
+		${conf}
+}
+
+src_test() {
+	emake check || die "testsuite failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index 8d36d5b01cd..fb2117aa2f6 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>kde</herd>
+  <use>
+    <flag name="gtk3">Build experimental gtk3 version instead of using gtk2</flag>
+    <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/libindicate-qt/Manifest b/dev-libs/libindicate-qt/Manifest
new file mode 100644
index 00000000000..ae31f0c5170
--- /dev/null
+++ b/dev-libs/libindicate-qt/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libindicate-qt-0.2.5.tar.bz2 33610 RMD160 2cdee3d1553a9c899b035bde7c809420965c4b5e SHA1 22aa4e27d42c02c58ebebffb9244a04cfc1959dd SHA256 ac5c41a78feec820bc140b43c2ded7cb952f15e0d92f3af379faf586f08ad6b0
+EBUILD libindicate-qt-0.2.5.ebuild 511 RMD160 f198c192cac5731bcb97b687ff2649be9df587f9 SHA1 d71fffbe2281dfee027909710290045f1d078f11 SHA256 81f07986adc91c60cf4f756b19afcd62682bee9f8280b460a60bfc073c1647b8
+MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1EpzAACgkQjqfyF1DtJW646ACeP9zGWCO4Xb27U/9ZebEMhZqr
+krsAn1mI4iNbOA3M1pTmDxQGgwRAE/wS
+=hEUA
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.ebuild
new file mode 100644
index 00000000000..c8922c27301
--- /dev/null
+++ b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit cmake-utils
+
+DESCRIPTION="Qt wrapper for libindicate library"
+HOMEPAGE="https://launchpad.net/libindicate-qt/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/qt-gui:4
+	>=dev-libs/libindicate-0.3.3
+	<dev-libs/libindicate-0.4.50
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
diff --git a/dev-libs/libindicate-qt/metadata.xml b/dev-libs/libindicate-qt/metadata.xml
new file mode 100644
index 00000000000..8d36d5b01cd
--- /dev/null
+++ b/dev-libs/libindicate-qt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>kde</herd>
+</pkgmetadata>
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 79db82e7b83..3f7ff124d46 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 900 RMD160 6e443308df87cf12e717ee014c38866d01c34fb5 SHA1 f37c008bb318daafe58525d38dead7c1a5f84c1e SHA256 71cdef52b7ec26ddeb421aa07c8cde4f170741f4ab6af5337c6ae44b981f6410
+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-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-gtk.patch 796 RMD160 f42b2ed5254bfa6d87b90c8330610b32bc6595fc SHA1 5c27abc06e8516a84334130a5921d0dba5cb8fa6 SHA256 6b9181fa91b8d9b4a5bb8f962800468065b3bb0c48ff8f8b6e1d2854ffe78ae1
 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
 DIST libindicate-0.4.4.tar.gz 473110 RMD160 2e926172d8b0a2604f44b2b42ee70f3a1fc837f9 SHA1 0dc3ad4c35581adea9d9ae89daacf820c764f24a SHA256 20d7ac6fe02b28283c619fe583d5b0fb8a473bb17ef020c2fa40c53f72e315ce
-EBUILD libindicate-0.4.4-r1.ebuild 2756 RMD160 3adeb89f1c152fa5dc5dfae86656ee1b6e76171d SHA1 2ed9f15537b533c26306f52d75e938b9db8fe814 SHA256 5d367abf312c06b2e5ef42c6f6368090e9e53d5555e7b4229adb5f5579925db6
-MISC metadata.xml 258 RMD160 69b53b6c07c87d5673ee16de06750f3aceed35e8 SHA1 649b8b012b03f82fe418ff135f90f7e21bcc4263 SHA256 5603025b3bd04b6daa8f57cba6ad6eea690cf08beff6c011c38d35acafb3a2d9
+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 3859 RMD160 86676e1fbe3828a736373ca9a3112089521c8e29 SHA1 6cbe88523526ed55fc04a1673f744acf9faf3186 SHA256 a8c6c6ab37cae6ee5d67290c149aa1da34eb9fbeed5568fa66e53d3b320bc4b6
+MISC metadata.xml 366 RMD160 aaed9ac306fbf7c939c135e5ce428fd8e7ccae69 SHA1 945981181f6751b4f3927ca443ee8031279fef30 SHA256 d6322d845754bcc6abcc2288430c2343be3bdb848ce7ef385f7f1e586fb91ec0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1ErSwACgkQjqfyF1DtJW7qMQCgxMG49bEP1YgbKATGNKIuOe0M
+irMAoJLeChF5vzqSiwMz6+Hk4tRKELCs
+=//4P
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
new file mode 100644
index 00000000000..1554b4c14bb
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
@@ -0,0 +1,12 @@
+--- bindings/mono/indicate/Makefile.am.orig	2011-01-30 00:14:17.670042664 +0100
++++ bindings/mono/indicate/Makefile.am	2011-01-30 00:14:40.204346425 +0100
+@@ -61,7 +61,8 @@
+ 		-e "s|PROP_MENU|menu|" \
+ 		-e "s|PROP_DESKTOP|Desktop|" \
+ 		-e "s|PROP_DESKTOP|desktop|" \
+-		$< > $@
++		$< > $@.tmp
++	mv $@.tmp $@
+ 
+ api_includes = $(GTK_SHARP_CFLAGS)
+ 
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 b4f6d6f9dbb..857bc7acd23 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
@@ -21,16 +21,15 @@
  ##############################
 --- 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
-+
+@@ -1,2 +1,6 @@
+ 
 +if WANT_DOC
-+SUBDIRS += docs
++DOC_SUBDIR = docs
 +endif
++
+ SUBDIRS = \
+@@ -8,3 +12,3 @@
+ 	tests \
+-	docs
++	$(DOC_SUBDIR)
  
- EXTRA_DIST = \
- 	COPYING.LGPL.2.1 \
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 6376b46d708..90272e341da 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
@@ -1,8 +1,6 @@
 --- 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
+@@ -66,3 +66,9 @@
  
 +AC_ARG_ENABLE([gtk],
 +	AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
@@ -10,33 +8,23 @@
 +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
-+
+ GDK_PIXBUF_REQUIRED_VERSION=2.12
+ 
+@@ -75,3 +66,4 @@
  AC_SUBST(LIBINDICATEGTK_CFLAGS)
  AC_SUBST(LIBINDICATEGTK_LIBS)
++fi
  
 --- 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 @@
+@@ -1,5 +1,9 @@
  
++if WANT_LIBINDICATEGTK
++LIBINDICATEGTK_SUBDIR = libindicate-gtk
++endif
++
  SUBDIRS = \
  	libindicate \
 -	libindicate-gtk \
++	$(LIBINDICATEGTK_SUBDIR) \
  	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.91-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
new file mode 100644
index 00000000000..357c6e3d049
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
@@ -0,0 +1,23 @@
+--- 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 @@
+-AM_PATH_PYTHON(2.3.5)
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+-
++PYTHON_REQUIRED=2.3.5
+ PYGTK_REQUIRED=2.14.0
+ PYGOBJECT_REQUIRED=0.22
+ 
+-PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
+-				    pygobject-2.0 >= $PYGOBJECT_REQUIRED])
++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)
+ 
+-INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
+ # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
+ INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
+ 
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
new file mode 100644
index 00000000000..323224ad1c7
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2011-01-29 21:02:19.646030407 +0100
++++ configure.ac	2011-01-29 21:12:00.156516831 +0100
+@@ -91,6 +91,12 @@
+ # Check for Mono support
+ ###########################
+ 
++AC_ARG_ENABLE([mono],
++	AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
++	[enable_mono=$enableval], enable_mono=auto)
++AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
++
++if test "x$enable_mono" != "xno" ; then
+ MONO_REQUIRED_VERSION=1.0
+ PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+ 
+@@ -141,6 +147,7 @@
+ AC_SUBST(GAPI_CODEGEN)
+ AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
+ AC_SUBST(GAPI_FIXUP)
++fi
+ 
+ ###########################
+ # Check for Python support
+--- 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 @@
++if WANT_MONO
++MONO_SUBDIR = mono
++endif
++
+-SUBDIRS = mono python
++SUBDIRS = $(MONO_SUBDIR) python
+ 
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
new file mode 100644
index 00000000000..cb058bc7e25
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
@@ -0,0 +1,35 @@
+--- 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 @@
+ # Check for Python support
+ ###########################
+ 
++AC_ARG_ENABLE([python],
++	AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
++	[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
++
+ AM_PATH_PYTHON(2.3.5)
+@@ -179,6 +185,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 
+--- 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 @@
++if WANT_PYTHON
++PYTHON_SUBDIR = python
++endif
++
+-SUBDIRS = mono python
++SUBDIRS = mono $(PYTHON_SUBDIR)
+ 
diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
index 6fe0469bfab..5dd78c45738 100644
--- a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
+++ b/