6 files changed, 93 insertions, 14 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index ed012581152..009c6365ea4 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,7 +1,9 @@
 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 1600 RMD160 86fb1348be6e38ab3828fc9563f885c5bf65a2b4 SHA1 67e4c9162f1f2e14fe168b055d44376edd701d83 SHA256 25382cba0dea6bf616abee6c5995f53df8ed7cac8c38753852734122fa43bce8
+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
+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
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
new file mode 100644
index 00000000000..d98ffabba56
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
@@ -0,0 +1,9 @@
+--- 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
+@@ -12,6 +13,4 @@
+ 
+ dbusmenu_testapp_LDADD = \
+ 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
+-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
+-	$(DBUSMENUGTK_LIBS) \
+ 	$(DBUSMENUTESTS_LIBS)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
index b334b27638d..7fdc051c765 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
@@ -35,3 +35,51 @@
 +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 @@
+ 	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
++endif
+ 
+ check_PROGRAMS = \
+ 	glib-server-nomenu \
+@@ -30,19 +34,23 @@
+ 	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
++endif
+ 
+ XVFB_RUN=". $(srcdir)/run-xvfb.sh"
+ 
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
index b4dd4d307e8..b0518717c1e 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
@@ -29,14 +29,16 @@
 +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 @@
+--- 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 @@
  
--SUBDIRS = testapp
-+SUBDIRS =
+-libexec_PROGRAMS = dbusmenu-testapp
++libexec_PROGRAMS =
 +
 +if WANT_TESTS
-+SUBDIRS += testapp
++libexec_PROGRAMS += dbusmenu-testapp
 +endif
  
+ dbusmenu_testapp_SOURCES = \
+    main.c
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
new file mode 100644
index 00000000000..ed605df58c5
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- 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/libdbusmenu-0.3.14.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
index 0ac9b8c3187..877b458aed9 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.14.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
@@ -13,8 +13,9 @@ SRC_URI="http://launchpad.net/dbusmenu/$(get_version_component_range 1-2)/${PV}/
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
+IUSE="gtk +introspection test"
 
+# Needs running dbus and a program called "dbus-test-runner"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
@@ -22,7 +23,8 @@ RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2:2
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/json-glib )
+    introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	test? ( dev-libs/json-glib[introspection=] )
 	dev-util/intltool
 	dev-util/pkgconfig"
 
@@ -31,10 +33,14 @@ src_prepare() {
 	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"
+	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
+	epatch "${FILESDIR}/${P}-decouple-testapp.patch"
 	# Make dbusmenudumper optional, launchpad-bug #643871
-	epatch "${FILESDIR}/${P}-optional-dumper.patch"
+	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
 	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
-	epatch "${FILESDIR}/${P}-fix-aclocal.patch"
+	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
@@ -44,6 +50,7 @@ src_configure() {
 	econf \
 		$(use_enable gtk) \
 		$(use_enable gtk dumper) \
+		$(use_enable introspection) \
 		$(use_enable test tests)
 }