[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/

[Dennis Schridde]

commit:     6a7db316653a72172956cf36547b35e39c256c9a
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sat Feb  5 16:13:47 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sat Feb  5 17:00:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a7db316

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

---
 .../libdbusmenu-0.3.16-fix-introspection.patch     |   11 ++++
 .../files/libdbusmenu-0.3.16-optional-vala.patch   |   52 ++++++++++++++++++++
 .../libdbusmenu-0.3.94-fix-introspection.patch     |   11 ++++
 ...-0.3.16.ebuild => libdbusmenu-0.3.16-r1.ebuild} |   19 ++++++-
 ...-0.3.94.ebuild => libdbusmenu-0.3.94-r1.ebuild} |   15 +++++-
 dev-libs/libdbusmenu/metadata.xml                  |    1 +
 6 files changed, 105 insertions(+), 4 deletions(-)

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 0000000..5977795
--- /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 0000000..9aceb88
--- /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 0000000..a259942
--- /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
similarity index 74%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
index e3e418f..c912279 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
similarity index 80%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
index 7317cc5..47b58a0 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 fb2117a..bb3e5c1 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>