[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)

6 files changed, 129 insertions, 4 deletions

diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 4ee1bef49de..cb607965c19 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,6 +1,10 @@
 AUX libdbusmenu-0.2.8-1-optional-gtk.patch 1075 RMD160 4c32361e3f067fd7f3bf2ce79b56c596249ca9bb SHA1 83509f4e77f045b844fb9c472cd32b98bad0bdbd SHA256 9ee4597a6113eb3868a8f69ce6ecdd02ef5cb926febf45879a4202ea346179f8
 AUX libdbusmenu-0.2.8-2-optional-tests.patch 1073 RMD160 1f2ac693cc10cbcb1635c4357ef0d0e57ae699f2 SHA1 095c326b0de91aba441ed20425dcc9ffe968819d SHA256 7edd3e056ed470d999c2346c408ccdfc0218c30e7b7d10f413e9b45811d4628c
 AUX libdbusmenu-0.2.8-no-gobject-introspection.patch 297 RMD160 467e14be23f3891540f67022f8d602287434d936 SHA1 66819750f37812c3f2950d7d4c46fb84cc57b5cc SHA256 fa6411ae8f311d4e2b8ac2c40314d28996905b2aaf2a8361c743d17845dcff1f
+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.14-optional-gtk.patch 1099 RMD160 3806e528cb42efe54c0e107cde0275c138f96140 SHA1 8098bc76f48c942571b917f140e0c319b266cc66 SHA256 d09ce64e27691487ddfe365e34c6eda480981b34b9d4948100b6408d288a47a0
+AUX libdbusmenu-0.3.14-optional-tests.patch 1147 RMD160 52f75d8f8e00d27917aca3681557a2013a025112 SHA1 28bac5681b2e8db16d5b81a926c10dc544e487e2 SHA256 cd1deb8ea259e858883cfedf2a1fcc40b2a9fb0abb6145d502e93b50b1c5ebd5
 DIST libdbusmenu-0.3.14.tar.gz 1150111 RMD160 86f47b0e84617d6c92791fecfc6e23800b4847f8 SHA1 014faeb260daec08847982ccfa52a85918a9147e SHA256 06085c35f51f5d54b12685e06de3cc609a549deb07741eea383f12d7df894fba
-EBUILD libdbusmenu-0.3.14.ebuild 1465 RMD160 656710725e24f16e7925cd2af012647921fe99cf SHA1 9698318bb8b0e9b6f3d062b40adbf52bde7540c8 SHA256 7c376863b0e4a389646eb1f40e329075b9e6628e86a2b4de0ae51d381c5da479
+EBUILD libdbusmenu-0.3.14.ebuild 1581 RMD160 ae60326a60c07329f5265acdc15b9e0e73d952b0 SHA1 e3e019aaf04336e4467440e6e7d50e778f970983 SHA256 0d40155f61e6e6890f3ad49e48591c636b6cea848808143e0dbcc737d2361295
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
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
+ 
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.14.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.14.ebuild
index ace306a412d..c9e913cff8c 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.14.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.14.ebuild
@@ -27,11 +27,13 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
-	epatch "${FILESDIR}/${P}-1-optional-gtk.patch"
+	epatch "${FILESDIR}/${P}-optional-gtk.patch"
 	# Make tests optional, launchpad-bug #552526
-	epatch "${FILESDIR}/${P}-2-optional-tests.patch"
+	epatch "${FILESDIR}/${P}-optional-tests.patch"
+	# Make dbusmenudumper optional, launchpad-bug #643871
+	epatch "${FILESDIR}/${P}-optional-dumper.patch"
 	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
-	epatch "${FILESDIR}/${P}-no-gobject-introspection.patch"
+	epatch "${FILESDIR}/${P}-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
@@ -40,6 +42,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable gtk) \
+		$(use_enable gtk dumper) \
 		$(use_enable test tests)
 }