[dev-libs/libdbusmenu] Version bump to 0.3.94, fix patches to preserve SUBDIR order, update metadata.xml

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

5 files changed, 140 insertions, 28 deletions

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"
+