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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 64 insertions, 12 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/Manifest b/media-libs/libchamplain/Manifest
index 24fcd7d24297..4d36643f6bef 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libchamplain-0.12.0-redrawing.patch 834 RMD160 8d0eb51fe8b74aa9256a08dd0d8037a708347813 SHA1 2d5757ac0b4386a89765fc6cd13614ca37279bbb SHA256 8c9a31d2f0c41f05530a8181938de42681e8fa5aeb8d7cbecd7078dec0c1deee
+AUX libchamplain-0.12.1-vala-cogl-pango-1.0.patch 2028 RMD160 1d87d1431a14b8a91028db722a59546cdc014f0f SHA1 9d4f5ec52d16a54e27d3d78167a0ebdb8dbfa218 SHA256 dc3c7ba357267989293efa3cfec09421d4ad5f4f140ac7d1d665ffb6cb983a38
 DIST libchamplain-0.10.1.tar.bz2 670134 RMD160 8d0a571ed762dc8ecd02d438e0e99ee45b711910 SHA1 5998275a6434d900950e31242f3b5041e56055cc SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63
 DIST libchamplain-0.12.0.tar.xz 588060 RMD160 6e79749962b09e63fdff77cc1c8f3dd77fad6c24 SHA1 59faa6d5b2cdb65e4d41a7ee3746af2e857487e5 SHA256 c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85
 DIST libchamplain-0.12.1.tar.xz 590176 RMD160 0f14c5266ba6e11e223a88a22823a6bf18cbf7cf SHA1 323bab0eeea8d2b63b21bd6cdfcf59c3600f7f64 SHA256 ac51b31ae46d22e1f3200b0e897b18bc5af2832eed24125d2a20adbc1ac232a1
@@ -9,15 +10,15 @@ DIST libchamplain-0.6.0.tar.bz2 699922 RMD160 49c8e48c9b52d4fdf90773f6106e51c984
 DIST libchamplain-0.8.3.tar.bz2 667873 RMD160 e5670e2698e0951f60a4168bbc9b2e788461e2a7 SHA1 da7b335db417574c3d407873c3e86f1263002d3d SHA256 70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3
 EBUILD libchamplain-0.10.1.ebuild 1864 RMD160 32bb9c35bcaa1ab5db9e200c4c529629a216ff3e SHA1 c601460a9dbcd2bbc00bfda9e7eb70a173708495 SHA256 e878f568c51ceff465283f20923d327a83aa81ec3491a91946dae97f531e5b03
 EBUILD libchamplain-0.12.0-r1.ebuild 2018 RMD160 3e881adfaa5fba4d8f989641f231a512281dd706 SHA1 bf7afcd9fef98f516d23ec55f5fe4a445765d4e8 SHA256 1d2469833a02f4990a2e72cdffa01d98467330610cebffd8b02d12d269da9695
-EBUILD libchamplain-0.12.1.ebuild 1862 RMD160 5b9f003cef38f2cd71d8976ffeb76a4589a2d0ed SHA1 aafeca377aac8a6ae87e38e64c868b5aa98df695 SHA256 081a7e0dfea0824f87cc117d4909296bae7bf591b267768c9d7f5a75302c14c8
+EBUILD libchamplain-0.12.1.ebuild 2072 RMD160 7cfd6e6b4c2554fb5cce96da0c7f0d10ee8b8720 SHA1 2c2c46eb8616d161d0d838507af44088a10e7223 SHA256 0c218f6b508e2bcf98b621484701928991db9f7de57c3da3cb400042d16d4b67
 EBUILD libchamplain-0.6.0.ebuild 2133 RMD160 1ec701653d2d93afe28c75fcd61466c309a3038d SHA1 7cab5eb63c5beb9352d6a1f0f904097ce1a67c72 SHA256 75d0db4311b685f9ece9259785dbab9803f02c308ae8f6c77cc40f1c502a7baf
 EBUILD libchamplain-0.8.3.ebuild 1259 RMD160 9bc21684a4ee110e0c5f05a0c86ac3b66c8a8af2 SHA1 55a2e447320e8174604e5b51f7074ff8407fed59 SHA256 6015eb9a3716e09d5940fd74da9f77d1edc5f6b24a9171915def1e03cf6f9e86
-MISC ChangeLog 4322 RMD160 cb9f63ae69edfe796f4ff49af5ced9877cb2b5e3 SHA1 6611a9f13c8391b2ca2b4cf96d6459c23f4b8a33 SHA256 f6f5797c1725c43d9cc0bf43219c66f184da98dbb418cb2d6a3803fec54bbcb9
+MISC ChangeLog 4563 RMD160 4aa32338b9ffa1f761e61d5ae5ccdefaf337e528 SHA1 25d3944b036f97458c877a21567ecb24308066b8 SHA256 8da40d798407219aa13ec5d279e24d0dc317c2bcc1bf6a2ab7c75b6b9c8d6d68
 MISC metadata.xml 406 RMD160 c00c800600241193f8cd1c1a3a395aaf5df82c0d SHA1 5094d7dfadb49335e47bb8ef49246f10989559c2 SHA256 5a7e5e53034775fbe975a8611a680c0bf5bcd13588dac58f02b506b1c3f1db9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7zv4IACgkQ1fmVwcYIWAa86QCfey6DdPYBz44pIBLq0WwbcPv7
-da4AoKFLHkF1l6qgHl+me2M2J8JFqw93
-=iAMN
+iF4EAREIAAYFAk8ttNIACgkQdjK8w9WeBnDn2gEAphXVWJLM4enNhF4Klv7jaN4G
+NgCWtxA+97cPa7jq3qsA/je1uNcHdlh1uVyX3nxMPUr47bagKqiM1keNcz8HdD6m
+=Wlv2
 -----END PGP SIGNATURE-----
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
 }