[dev-libs/libdbusmenu] Bump all patches to version 0.3.14, fix compilation

All functionality introduced by previous patches was kept,
 additionally the dbusmenudumper is also optional (it depends on gtk)

(Portage version: 2.2_rc85/git/Linux x86_64, unsigned Manifest commit)

4 files changed, 118 insertions, 0 deletions

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch
new file mode 100644
index 00000000000..d4fdcaaecf0
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
++++ Makefile.am	2010-09-20 22:21:12.976592367 +0200
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST = \
+ 	COPYING.2.1 \
+ 	COPYING-GPL3 \
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
new file mode 100644
index 00000000000..3edc237a748
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
@@ -0,0 +1,31 @@
+--- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
++++ configure.ac	2010-09-20 22:05:38.292979567 +0200
+@@ -63,8 +63,15 @@
+ 
+ X11_REQUIRED_VERSION=1.3
+ 
++AC_ARG_ENABLE([dumper],
++	AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
++	[enable_dumper=$enableval], enable_dumper=auto)
++AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
++
++if test "x$enable_dumper" != "xno" ; then
+ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                   x11 >= $X11_REQUIRED_VERSION)
++fi
+ 
+ AC_SUBST(DBUSMENUDUMPER_CFLAGS)
+ AC_SUBST(DBUSMENUDUMPER_LIBS)
+--- tools/Makefile.am.orig	2010-09-20 22:02:07.280175897 +0200
++++ tools/Makefile.am	2010-09-20 22:05:15.621664358 +0200
+@@ -3,5 +3,9 @@
+ 
+-libexec_PROGRAMS = dbusmenu-dumper
++libexec_PROGRAMS =
++
++if WANT_DBUSMENUDUMPER
++libexec_PROGRAMS += dbusmenu-dumper
++endif
+ 
+ libexec_SCRIPTS = dbusmenu-bench
+ 
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch
new file mode 100644
index 00000000000..b334b27638d
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch
@@ -0,0 +1,37 @@
+--- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
++++ configure.ac	2010-09-20 21:58:03.536293089 +0200
+@@ -49,10 +49,17 @@
+ 
+ GTK_REQUIRED_VERSION=2.16
+ 
++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"])
++
++if test "x$enable_gtk" != "xno"; then
+ PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                 dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                 libxml-2.0 >= $XML_REQUIRED_VERSION)
++fi
+ 
+ AC_SUBST(DBUSMENUGTK_CFLAGS)
+ 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 @@
+ 
+ SUBDIRS = \
+ 	libdbusmenu-glib \
+-	libdbusmenu-gtk \
+ 	tools \
+ 	tests \
+ 	docs \
+ 	po
+ 
++if WANT_LIBDBUSMENUGTK
++SUBDIRS += libdbusmenu-gtk
++endif
++
+ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch
new file mode 100644
index 00000000000..b4dd4d307e8
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch
@@ -0,0 +1,42 @@
+--- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
++++ configure.ac	2010-09-20 22:01:21.623107607 +0200
+@@ -76,8 +76,15 @@
+ JSON_GLIB_REQUIRED_VERSION=0.6.0
+ GIO_UNIX_REQUIRED_VERSION=2.24
+ 
++AC_ARG_ENABLE([tests],
++	AC_HELP_STRING([--disable-tests], [Disable tests]),
++	[enable_tests=$enableval], enable_tests=auto)
++AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
++
++if test "x$enable_tests" != "xno" ; then
+ PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                   gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
++fi
+ 
+ AC_SUBST(DBUSMENUTESTS_CFLAGS)
+ 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
+ 
++if WANT_TESTS
++SUBDIRS += tests
++endif
++
+ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
+--- tools/Makefile.am.orig	2010-09-20 22:02:07.280175897 +0200
++++ tools/Makefile.am	2010-09-20 22:02:40.579759752 +0200
+@@ -1,3 +1,7 @@
+ 
+-SUBDIRS = testapp
++SUBDIRS =
++
++if WANT_TESTS
++SUBDIRS += testapp
++endif
+