[dev-libs/libdbusmenu] Optional Vala, fix parallel-build of introspection, revbump

Bug: 353308

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

7 files changed, 111 insertions, 17 deletions

diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index b535f0eaba6..40881fc8f63 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,22 +1,15 @@
------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-fix-introspection.patch 424 RMD160 2e8f958a104d932289447419f3e20546fd85ed40 SHA1 aab1cd4ec40eb87e741cadfbb81e6ca79c5bbc8e SHA256 d7f2f92cbdc4f20d6f1ac51ad7954f4849d5054886c0528d6f65934275e03209
 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.16-optional-vala.patch 1366 RMD160 897310993e5138a4ddbb020cfe5883ff2b849991 SHA1 ec27559b6192e0fc2bf83e7d39733c17ceee3333 SHA256 06ab99b2b7bafbbb259f8f66bd316b29071e9d8bb589ec969ddbd918405c15ec
 AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d
+AUX libdbusmenu-0.3.94-fix-introspection.patch 440 RMD160 c3f88647e841352a8458d225c69128b8f74fdcca SHA1 45ee137cc519dce56bbd59d0ce9ba3975c6719ad SHA256 1bf6efc1150e42bfda680678e7ef926f6aa50bd3d4e9854c877cdcf8a61762ee
 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
 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-----
+EBUILD libdbusmenu-0.3.16-r1.ebuild 2398 RMD160 22f0f8c7acf115fdb2d86687f142f3907c222687 SHA1 736ee056c2359f8fcfcf4479c59e26c986380831 SHA256 4a605e7b212b844fd3e96a18a29bce8712ecd4a5c316c7b50d2d2ad496185c2e
+EBUILD libdbusmenu-0.3.94-r1.ebuild 2755 RMD160 0e53cf4bb467c59af535774c1fec5a1e68e2fd48 SHA1 490c391c84e281c14b8b7cc95938e235bb4d8193 SHA256 eb4bfa90ca7c92c7e6e2dd84da55cf2f607d0fa4d94230cafdc098c10f104108
+MISC metadata.xml 409 RMD160 2ee443faa26b15e8e12281faee55e2b160768745 SHA1 220966ab3109ae2969566a0c3ac8d1e1cda4fe18 SHA256 75ac27fadab34b1d697a2d610678d4f990077f3b50f76a23b37e2a776ec9bc18
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
new file mode 100644
index 00000000000..59777950e81
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
@@ -0,0 +1,11 @@
+--- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:38:38.713641727 +0100
++++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:38:44.917448353 +0100
+@@ -123,7 +123,7 @@
+ 
+ introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
+ 
+-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
++Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la
+ Dbusmenu_Glib_0_2_gir_INCLUDES = \
+ 	GObject-2.0
+ Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
new file mode 100644
index 00000000000..9aceb8896e4
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
@@ -0,0 +1,52 @@
+--- configure.ac.orig	2011-02-05 15:01:31.212827464 +0100
++++ configure.ac	2011-02-05 15:13:08.310031260 +0100
+@@ -143,7 +143,17 @@
+ # Vala API Generation
+ ###########################
+ 
++AC_ARG_ENABLE([vala],
++	AC_HELP_STRING([--disable-vala], [Disable vala]),
++	[enable_vala=$enableval], enable_vala=auto)
++AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" != "xno"])
++
++if test "x$enable_vala" != "xno" ; then
++if test "x$enable_introspection" = "xno" ; then
++	AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
++fi
+ AC_PATH_PROG([VALA_API_GEN], [vapigen])
++fi
+ 
+ ###########################
+ # XSLT Processor
+--- libdbusmenu-gtk/Makefile.am.orig	2011-02-05 15:09:06.429965757 +0100
++++ libdbusmenu-gtk/Makefile.am	2011-02-05 15:08:14.742722310 +0100
+@@ -131,6 +131,7 @@
+ # VAPI Files
+ #########################
+ 
++if WANT_VALA
+ if HAVE_INTROSPECTION
+ 
+ vapidir = $(datadir)/vala/vapi
+@@ -154,4 +155,5 @@
+ CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
+ 
+ endif
++endif
+ 
+--- libdbusmenu-glib/Makefile.am.orig	2011-02-05 15:08:49.613538681 +0100
++++ libdbusmenu-glib/Makefile.am	2011-02-05 15:06:23.826443241 +0100
+@@ -165,6 +165,7 @@
+ # VAPI Files
+ #########################
+ 
++if WANT_VALA
+ if HAVE_INTROSPECTION
+ 
+ vapidir = $(datadir)/vala/vapi
+@@ -176,4 +177,5 @@
+ CLEANFILES += $(vapi_DATA)
+ 
+ endif
++endif
+ 
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
new file mode 100644
index 00000000000..a2599425365
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
@@ -0,0 +1,11 @@
+--- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:16:34.481082458 +0100
++++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:20:31.703396315 +0100
+@@ -138,7 +138,7 @@
+ 
+ introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
+ 
+-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
++Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la
+ Dbusmenu_Glib_0_4_gir_INCLUDES = \
+ 	GObject-2.0
+ Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
index e3e418fee4d..c9122790a45 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
@@ -13,9 +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 +introspection test"
+IUSE="gtk +introspection test vala"
 
-# Needs running dbus and a program called "dbus-test-runner"
+# Needs dev-util/dbus-test-runner (not yet in tree)
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
@@ -25,10 +25,20 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	test? ( dev-libs/json-glib[introspection=] )
+	vala? ( dev-lang/vala:0 )
 	dev-util/intltool
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	if use vala && use !introspection ; then
+		eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+		die "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+	fi
+}
+
 src_prepare() {
+	# Make Vala bindings optional, launchpad-bug #713685
+	epatch "${FILESDIR}/${P}-optional-vala.patch"
 	# Make tests optional, launchpad-bug #552526
 	epatch "${FILESDIR}/${P}-optional-tests.patch"
 	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
@@ -39,6 +49,8 @@ src_prepare() {
 	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"
+	# Fix introspection generation, launchpad-bug #713690
+	epatch "${FILESDIR}/${P}-fix-introspection.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
 	eautoreconf
@@ -49,7 +61,8 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable gtk dumper) \
 		$(use_enable introspection) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		$(use_enable vala)
 }
 
 src_test() {
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
index 7317cc548d8..47b58a04352 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk3 +introspection test"
+IUSE="gtk gtk3 +introspection test vala"
 
 # Needs dev-util/dbus-test-runner (not yet in tree)
 RESTRICT="test"
@@ -33,10 +33,20 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	test? ( dev-libs/json-glib[introspection=] )
+	vala? ( dev-lang/vala:0 )
 	dev-util/intltool
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	if use vala && use !introspection ; then
+		eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+		die "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+	fi
+}
+
 src_prepare() {
+	# Make tests optional, launchpad-bug #713685
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch"
 	# Make tests optional, launchpad-bug #552526
 	epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch"
 	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
@@ -47,6 +57,8 @@ src_prepare() {
 	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"
+	# Fix introspection generation, launchpad-bug #713690
+	epatch "${FILESDIR}/${PN}-0.3.16-fix-introspection.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
 	eautoreconf
@@ -65,6 +77,7 @@ src_configure() {
 		$(use_enable gtk dumper) \
 		$(use_enable introspection) \
 		$(use_enable test tests) \
+		$(use_enable vala) \
 		${conf}
 }
 
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index fb2117aa2f6..bb3e5c11a2e 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -5,5 +5,6 @@
   <use>
     <flag name="gtk3">Build experimental gtk3 version instead of using gtk2</flag>
     <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+	<flag name="vala">Enable bindings for dev-lang/vala</flag>
   </use>
 </pkgmetadata>