Fix building vala bindings (bug #402013, thanks to Billy DeVincentis for reporting).

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 57 insertions, 6 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index 7b838c9fa5da..c6fb0d76050e 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libchamplain
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.23 2011/12/22 23:38:36 eva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.24 2012/02/04 22:44:28 tetromino Exp $
+
+  04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libchamplain-0.12.1.ebuild,
+  +files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch:
+  Fix building vala bindings (bug #402013, thanks to Billy DeVincentis for
+  reporting).
 
 *libchamplain-0.12.1 (22 Dec 2011)
 
diff --git a/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch b/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch
new file mode 100644
index 000000000000..0bbd3ecb988d
--- /dev/null
+++ b/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch
@@ -0,0 +1,40 @@
+From 79062869a18ef70862f5cadb51a53731d3ba5cc1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 4 Feb 2012 16:51:53 -0500
+Subject: [PATCH] Call vapigen with --pkg cogl-pango-1.0
+
+https://bugzilla.gnome.org/show_bug.cgi?id=669378
+---
+ champlain-gtk/Makefile.am |    2 +-
+ champlain/Makefile.am     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
+index 1efeeea..549c197 100644
+--- a/champlain-gtk/Makefile.am
++++ b/champlain-gtk/Makefile.am
+@@ -113,7 +113,7 @@ if ENABLE_VALA
+ CLEANFILES += $(dist_vapi_DATA)
+ 
+ champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi:	GtkChamplain-@CHAMPLAIN_API_VERSION@.gir
+-	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
++	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
+ 
+ endif
+ 
+diff --git a/champlain/Makefile.am b/champlain/Makefile.am
+index a4b55a6..f145e9f 100644
+--- a/champlain/Makefile.am
++++ b/champlain/Makefile.am
+@@ -206,7 +206,7 @@ if ENABLE_VALA
+ CLEANFILES += $(dist_vapi_DATA)
+ 
+ champlain-@CHAMPLAIN_API_VERSION@.vapi:	Champlain-@CHAMPLAIN_API_VERSION@.gir
+-	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
++	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
+ 
+ endif
+ 
+-- 
+1.7.8.4
+
diff --git a/media-libs/libchamplain/libchamplain-0.12.1.ebuild b/media-libs/libchamplain/libchamplain-0.12.1.ebuild
index aea449d15643..56fffef902a4 100644
--- a/media-libs/libchamplain/libchamplain-0.12.1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.1.ebuild,v 1.1 2011/12/22 23:38:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.1.ebuild,v 1.2 2012/02/04 22:44:28 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Clutter based world map renderer"
 HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
@@ -32,8 +32,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( dev-lang/vala:0.14[vapigen] )"
+	vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] )"
 # segfaults with vala:0.12
+# vala-0.14.2-r1 required for bug #402013
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -52,6 +53,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #402013, https://bugzilla.gnome.org/show_bug.cgi?id=669378
+	epatch "${FILESDIR}/${P}-vala-cogl-pango-1.0.patch"
+
 	# Fix documentation slotability
 	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
 		-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
@@ -60,5 +64,6 @@ src_prepare() {
 	mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
 	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
 
+	eautoreconf
 	gnome2_src_prepare
 }